(PSEUDOVECSIZE): Fix last change.

diff --git a/src/ChangeLog b/src/ChangeLog
index 54c9b86db08519001f84591ca0e96bf5b192f20c..2c55dc037f8759c8afc99a426f8cb4e058352b12 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-08  Eli Zaretskii  <eliz@gnu.org>
+
+       * lisp.h (PSEUDOVECSIZE): Fix last change.
+
 2006-04-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * process.h (struct Lisp_Process): Replace Lisp_Objects `pid',

diff --git a/src/lisp.h b/src/lisp.h
index 63a17801a3d049cca13fb916e69efb1c2204ccf2..79b16d95188f6e16a5d558107006ce300ad45f45 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -713,6 +713,13 @@ struct Lisp_String
   ((int)((char*)&((type*)0)->field - (char*)0))
 #endif
 
+struct Lisp_Vector
+  {
+    EMACS_INT size;
+    struct Lisp_Vector *next;
+    Lisp_Object contents[1];
+  };
+
 /* If a struct is made to look like a vector, this macro returns the length
    of the shortest vector that would hold that struct.  */
 #define VECSIZE(type) ((sizeof (type) - (sizeof (struct Lisp_Vector)  \
@@ -724,16 +731,9 @@ struct Lisp_String
    at the end and we need to compute the number of Lisp_Object fields (the
    ones that the GC needs to trace).  */
 #define PSEUDOVECSIZE(type, nonlispfield) \
-  ((offsetof(type, nonlispfield) - offsetof(struct Lisp_Vector, contents[0])) \
+  ((OFFSETOF(type, nonlispfield) - OFFSETOF(struct Lisp_Vector, contents[0])) \
    / sizeof (Lisp_Object))
 
-struct Lisp_Vector
-  {
-    EMACS_INT size;
-    struct Lisp_Vector *next;
-    Lisp_Object contents[1];
-  };
-
 /* A char table is a kind of vectorlike, with contents are like a
    vector but with a few other slots.  For some purposes, it makes
    sense to handle a chartable with type struct Lisp_Vector.  An