From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 2 Jun 1997 02:34:00 +0000 (+0000)
Subject: (VALMASK, GCTYPEMASK, MARKBIT, ARRAY_MARK_FLAG)
X-Git-Tag: emacs-20.1~1831
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1c5ca8b6083e9a6be6482f53c20faf924b5d8ab5;p=emacs.git

(VALMASK, GCTYPEMASK, MARKBIT, ARRAY_MARK_FLAG)
(PSEUDOVECTOR_FLAG, enum pvec_type, PSEUDOVECTOR_SIZE_MASK):
Define regardless of NO_UNION_TYPE.
---

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;
 #endif /* NO_UNION_TYPE */
 
 
-/* If union type is not wanted, define Lisp_Object as just a number
-   and define the macros below to extract fields by shifting */
+/* If union type is not wanted, define Lisp_Object as just a number.  */
 
 #ifdef NO_UNION_TYPE
-
 #define Lisp_Object EMACS_INT
+#endif /* NO_UNION_TYPE */
 
 #ifndef VALMASK
 #define VALMASK ((((EMACS_INT) 1)<<VALBITS) - 1)
@@ -243,8 +242,6 @@ enum pvec_type
 
 /* For convenience, we also store the number of elements in these bits.  */
 #define PSEUDOVECTOR_SIZE_MASK 0x1ff
-
-#endif /* NO_UNION_TYPE */
 
 /* These macros extract various sorts of values from a Lisp_Object.
  For example, if tem is a Lisp_Object whose type is Lisp_Cons,