summaryrefslogtreecommitdiff
path: root/libguile/objects.h
diff options
context:
space:
mode:
authorDirk Herrmann <dirk@dirk-herrmanns-seiten.de>2001-05-27 22:00:03 +0000
committerDirk Herrmann <dirk@dirk-herrmanns-seiten.de>2001-05-27 22:00:03 +0000
commit729dbac32f9b3a8b2c6fe399f4e725549cecd1e7 (patch)
treeb8ffb0687a7290e037a64aef646fee3747574db0 /libguile/objects.h
parentfc62c86a599039709b22783a0abc552a5f33719e (diff)
downloadguile-729dbac32f9b3a8b2c6fe399f4e725549cecd1e7.tar.gz
* Changed the default definition of SCM.
* Fixed some typing problems detected by the above change. * Fixed some problems that were detected by compiling guile with -W.
Diffstat (limited to 'libguile/objects.h')
-rw-r--r--libguile/objects.h14
1 files changed, 6 insertions, 8 deletions
diff --git a/libguile/objects.h b/libguile/objects.h
index 3f9b5e9a8..649d3fb1e 100644
--- a/libguile/objects.h
+++ b/libguile/objects.h
@@ -1,9 +1,9 @@
/* classes: h_files */
-#ifndef OBJECTSH
-#define OBJECTSH
+#ifndef SCM_OBJECTS_H
+#define SCM_OBJECTS_H
-/* Copyright (C) 1996, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1996,1999,2000,2001 Free Software Foundation, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -99,10 +99,8 @@
#define SCM_SET_CLASS_DESTRUCTOR(c, d) SCM_SET_VTABLE_DESTRUCTOR (c, d)
#define SCM_SET_CLASS_INSTANCE_SIZE(c, s) \
-(SCM_STRUCT_DATA (c)[scm_struct_i_size] \
- = SCM_PACK ((SCM_UNPACK (SCM_STRUCT_DATA (c)[scm_struct_i_size])\
- & SCM_STRUCTF_MASK)\
- | s))
+ (SCM_STRUCT_DATA (c)[scm_struct_i_size] \
+ = (SCM_STRUCT_DATA (c) [scm_struct_i_size] & SCM_STRUCTF_MASK) | s)
/* {Operator classes}
*
@@ -242,7 +240,7 @@ extern SCM scm_i_make_class_object (SCM metaclass, SCM layout_string,
unsigned long flags);
extern void scm_init_objects (void);
-#endif /* OBJECTSH */
+#endif /* SCM_OBJECTS_H */
/*
Local Variables: