* lisp.h (XVECTORLIKE_HEADER_SIZE): Remove. The only use is now expanded.

diff --git a/src/ChangeLog b/src/ChangeLog
index 05d5c77e625b5de1a6f8a4360bc154b0a221963d..1adc153e953ff555790a03db16074592401bff4d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,7 @@
        * lisp.h: (XVECTOR_SIZE): Remove.  All uses replaced with ASIZE.
        (ASIZE): Now contains previous implementation of XVECTOR_SIZE
        instead of invoking XVECTOR_SIZE.
+       (XVECTORLIKE_HEADER_SIZE): Remove.  The only use is now expanded.
 
        * lisp.h: Say "vectorlike header" rather than "vector header.
        (struct vectorlike_header): Rename from struct vector_header.

diff --git a/src/lisp.h b/src/lisp.h
index 9733dde33c085fd442050e8e4c85bb11c80d20e5..4af12fb2f518c2805b0f68a58724ad3b13cbbc71 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -554,11 +554,6 @@ extern Lisp_Object make_number (EMACS_INT);
 #define XSYMBOL(a) (eassert (SYMBOLP(a)),(struct Lisp_Symbol *) XPNTR(a))
 #define XFLOAT(a) (eassert (FLOATP(a)),(struct Lisp_Float *) XPNTR(a))
 
-/* Extract the size field of a vector-like object.  */
-
-#define XVECTORLIKE_HEADER_SIZE(a) \
-  (((struct vectorlike_header *) XPNTR (a))->size + 0)
-
 /* Misc types.  */
 
 #define XMISC(a)   ((union Lisp_Misc *) XPNTR(a))
@@ -612,7 +607,9 @@ extern Lisp_Object make_number (EMACS_INT);
 #define XSETPVECTYPESIZE(v, code, sizeval) \
   ((v)->header.size = PSEUDOVECTOR_FLAG | (code) | (sizeval))
 #define XSETPSEUDOVECTOR(a, b, code) \
-  XSETTYPED_PSEUDOVECTOR(a, b, XVECTORLIKE_HEADER_SIZE (a), code)
+  XSETTYPED_PSEUDOVECTOR(a, b,       \
+                        ((struct vectorlike_header *) XPNTR (a))->size, \
+                        code)
 #define XSETTYPED_PSEUDOVECTOR(a, b, size, code)                       \
   (XSETVECTOR (a, b),                                                  \
    eassert ((size & (PSEUDOVECTOR_FLAG | PVEC_TYPE_MASK))              \