From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 2 Aug 2012 10:49:19 +0000 (-0700)
Subject: * lisp.h (VALMASK) [!USE_LSB_TAG]: Now a macro
X-Git-Tag: emacs-24.2.90~889
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a8333d0357ae39595ff60a4c73e1420504c26376;p=emacs.git

* lisp.h (VALMASK) [!USE_LSB_TAG]: Now a macro

as well as a constant, since it's used in non-static inline functions now.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index f65380abf33..c590e9fb32f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -30,6 +30,7 @@
 	(INLINE_HEADER_END): New macros.
 	* lisp.h (PSEUDOVECTOR_FLAG): Now a macro as well as a constant,
 	since it's used in non-static inline functions now.
+	(VALMASK) [!USE_LSB_TAG]: Likewise.
 
 2012-08-02  Glenn Morris  <rgm@gnu.org>
 
diff --git a/src/lisp.h b/src/lisp.h
index 1661ac1caa0..4b54af9fe43 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -423,7 +423,9 @@ enum lsb_bits
 
 #else  /* not USE_LSB_TAG */
 
-static EMACS_INT const VALMASK = VAL_MAX;
+static EMACS_INT const VALMASK
+#define VALMASK VAL_MAX
+      = VALMASK;
 
 #define XTYPE(a) ((enum Lisp_Type) ((EMACS_UINT) XLI (a) >> VALBITS))