diff options
| author | Richard M. Stallman | 1997-06-02 02:34:00 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1997-06-02 02:34:00 +0000 |
| commit | 1c5ca8b6083e9a6be6482f53c20faf924b5d8ab5 (patch) | |
| tree | bf6cc3ff277251da673ae771f0e669c38b31fcfe /src | |
| parent | e8d0501f723d903ed76506fb8f243aee4cfed973 (diff) | |
| download | emacs-1c5ca8b6083e9a6be6482f53c20faf924b5d8ab5.tar.gz emacs-1c5ca8b6083e9a6be6482f53c20faf924b5d8ab5.zip | |
(VALMASK, GCTYPEMASK, MARKBIT, ARRAY_MARK_FLAG)
(PSEUDOVECTOR_FLAG, enum pvec_type, PSEUDOVECTOR_SIZE_MASK):
Define regardless of NO_UNION_TYPE.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lisp.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/lisp.h b/src/lisp.h index 3f0fbc0c74a..f104af63794 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -181,12 +181,11 @@ Lisp_Object; | |||
| 181 | #endif /* NO_UNION_TYPE */ | 181 | #endif /* NO_UNION_TYPE */ |
| 182 | 182 | ||
| 183 | 183 | ||
| 184 | /* If union type is not wanted, define Lisp_Object as just a number | 184 | /* If union type is not wanted, define Lisp_Object as just a number. */ |
| 185 | and define the macros below to extract fields by shifting */ | ||
| 186 | 185 | ||
| 187 | #ifdef NO_UNION_TYPE | 186 | #ifdef NO_UNION_TYPE |
| 188 | |||
| 189 | #define Lisp_Object EMACS_INT | 187 | #define Lisp_Object EMACS_INT |
| 188 | #endif /* NO_UNION_TYPE */ | ||
| 190 | 189 | ||
| 191 | #ifndef VALMASK | 190 | #ifndef VALMASK |
| 192 | #define VALMASK ((((EMACS_INT) 1)<<VALBITS) - 1) | 191 | #define VALMASK ((((EMACS_INT) 1)<<VALBITS) - 1) |
| @@ -243,8 +242,6 @@ enum pvec_type | |||
| 243 | 242 | ||
| 244 | /* For convenience, we also store the number of elements in these bits. */ | 243 | /* For convenience, we also store the number of elements in these bits. */ |
| 245 | #define PSEUDOVECTOR_SIZE_MASK 0x1ff | 244 | #define PSEUDOVECTOR_SIZE_MASK 0x1ff |
| 246 | |||
| 247 | #endif /* NO_UNION_TYPE */ | ||
| 248 | 245 | ||
| 249 | /* These macros extract various sorts of values from a Lisp_Object. | 246 | /* These macros extract various sorts of values from a Lisp_Object. |
| 250 | For example, if tem is a Lisp_Object whose type is Lisp_Cons, | 247 | For example, if tem is a Lisp_Object whose type is Lisp_Cons, |