aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2013-03-02 10:19:45 +0200
committerEli Zaretskii2013-03-02 10:19:45 +0200
commit474b43d90fdc3135aa4f277a1b64281f1d3b24a6 (patch)
tree92582f6d440b61f67135e6ddc67f6527863e71dc /src
parent8725b746408685833dec0ee09f1a4fc680786c9a (diff)
downloademacs-474b43d90fdc3135aa4f277a1b64281f1d3b24a6.tar.gz
emacs-474b43d90fdc3135aa4f277a1b64281f1d3b24a6.zip
Fix bug #13734 with errors in lisp.h macro expansion.
src/lisp.h (XPNTR) [!USE_LSB_TAG]: Fix parentheses nesting.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/lisp.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 1b8b3c56004..f3ded8e3986 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12013-03-02 Eli Zaretskii <eliz@gnu.org>
2
3 * lisp.h (XPNTR) [!USE_LSB_TAG]: Fix parentheses nesting. (Bug#13734)
4
12013-02-28 Eli Zaretskii <eliz@gnu.org> 52013-02-28 Eli Zaretskii <eliz@gnu.org>
2 6
3 * w32.c (sys_open): Don't reset the flags for FD in fd_info[]. 7 * w32.c (sys_open): Don't reset the flags for FD in fd_info[].
diff --git a/src/lisp.h b/src/lisp.h
index e696371c58b..01574a5fe03 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -507,7 +507,7 @@ static EMACS_INT const VALMASK
507 507
508/* DATA_SEG_BITS forces extra bits to be or'd in with any pointers 508/* DATA_SEG_BITS forces extra bits to be or'd in with any pointers
509 which were stored in a Lisp_Object. */ 509 which were stored in a Lisp_Object. */
510#define XPNTR(a) ((uintptr_t) ((XLI (a) & VALMASK)) | DATA_SEG_BITS)) 510#define XPNTR(a) ((uintptr_t) ((XLI (a) & VALMASK) | DATA_SEG_BITS))
511 511
512#endif /* not USE_LSB_TAG */ 512#endif /* not USE_LSB_TAG */
513 513