diff options
Diffstat (limited to 'libguile/objects.h')
-rw-r--r-- | libguile/objects.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libguile/objects.h b/libguile/objects.h index a443e7cde..4b19275bd 100644 --- a/libguile/objects.h +++ b/libguile/objects.h @@ -3,7 +3,7 @@ #ifndef OBJECTSH #define OBJECTSH -/* Copyright (C) 1996, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1999, 2000 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 @@ -67,9 +67,10 @@ * certain class or its subclasses when traversal of the inheritance * graph would be too costly. */ -#define SCM_CLASS_FLAGS(class) SCM_ASWORD(SCM_STRUCT_DATA (class)[scm_struct_i_flags]) +#define SCM_CLASS_FLAGS(class)\ + SCM_ASWORD (SCM_STRUCT_DATA (class)[scm_struct_i_flags]) #define SCM_OBJ_CLASS_FLAGS(obj)\ - SCM_ASWORD(SCM_STRUCT_VTABLE_DATA (obj)[scm_struct_i_flags]) + SCM_ASWORD (SCM_STRUCT_VTABLE_DATA (obj)[scm_struct_i_flags]) #define SCM_SET_CLASS_FLAGS(c, f) (SCM_CLASS_FLAGS (c) |= (f)) #define SCM_CLEAR_CLASS_FLAGS(c, f) (SCM_CLASS_FLAGS (c) &= ~(f)) #define SCM_CLASSF_MASK SCM_STRUCTF_MASK @@ -97,7 +98,9 @@ #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_STRUCT_DATA (c)[scm_struct_i_size] & SCM_STRUCTF_MASK) | s) + = SCM_ASSCM ((SCM_ASWORD (SCM_STRUCT_DATA (c)[scm_struct_i_size])\ + & SCM_STRUCTF_MASK)\ + | s)) /* {Operator classes} * |