* struct.c, struct.h: Replace 4 procedure slots with one.

(scm_struct_i_procedure): Replaces scm_struct_i_procedure.

diff --git a/libguile/struct.c b/libguile/struct.c
index 6fbf859..295665e 100644 (file)
--- a/libguile/struct.c
+++ b/libguile/struct.c
@@ -391,10 +391,7 @@ scm_make_struct (vtable, tail_array_size, init)
       data = scm_alloc_struct (basic_size + tail_elts,
                               scm_struct_entity_n_extra_words,
                               "make-struct");
-      data[scm_struct_i_proc + 0] = SCM_BOOL_F;
-      data[scm_struct_i_proc + 1] = SCM_BOOL_F;
-      data[scm_struct_i_proc + 2] = SCM_BOOL_F;
-      data[scm_struct_i_proc + 3] = SCM_BOOL_F;
+      data[scm_struct_i_procedure] = SCM_BOOL_F;
       data[scm_struct_i_setter] = SCM_BOOL_F;
     }
   else

diff --git a/libguile/struct.h b/libguile/struct.h
index 0cd610c..1fd4dd4 100644 (file)
--- a/libguile/struct.h
+++ b/libguile/struct.h
@@ -51,11 +51,11 @@
 
 /* Number of words with negative index */
 #define scm_struct_n_extra_words 4
-#define scm_struct_entity_n_extra_words 9
+#define scm_struct_entity_n_extra_words 6
 
 /* These are how the initial words of a vtable are allocated. */
-#define scm_struct_i_setter    -9 /* Setter */
-#define scm_struct_i_proc      -8 /* Optional procedure slots */
+#define scm_struct_i_setter    -6 /* Setter */
+#define scm_struct_i_procedure -5 /* Optional procedure slot */
 #define scm_struct_i_free      -4 /* Destructor */
 #define scm_struct_i_ptr       -3 /* Start of block (see alloc_struct) */
 #define scm_struct_i_n_words   -2 /* How many words allocated to this struct? */