summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1997-06-02 02:34:00 +0000
committerRichard M. Stallman <rms@gnu.org>1997-06-02 02:34:00 +0000
commit059f6114da6b4202be1a9df4834e2b1b9076be79 (patch)
tree666c84d8dfad2d44bf23996fd06956bf2d2f1f64
parent44c1807486028f660ee26aa1d9fa84a2aea08155 (diff)
downloademacs-059f6114da6b4202be1a9df4834e2b1b9076be79.tar.gz
(VALMASK, GCTYPEMASK, MARKBIT, ARRAY_MARK_FLAG)
(PSEUDOVECTOR_FLAG, enum pvec_type, PSEUDOVECTOR_SIZE_MASK): Define regardless of NO_UNION_TYPE.
-rw-r--r--src/lisp.h7
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;
#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,