From 7e7735293958b207f7b026423212b0b2f68849f3 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 8 Apr 2006 16:37:46 +0000 Subject: [PATCH] (PSEUDOVECSIZE): Fix last change. --- src/ChangeLog | 4 ++++ src/lisp.h | 16 ++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 54c9b86db08..2c55dc037f8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2006-04-08 Eli Zaretskii + + * lisp.h (PSEUDOVECSIZE): Fix last change. + 2006-04-08 Stefan Monnier * process.h (struct Lisp_Process): Replace Lisp_Objects `pid', diff --git a/src/lisp.h b/src/lisp.h index 63a17801a3d..79b16d95188 100644 --- 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 -- 2.39.2