diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2013-02-14 22:35:54 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-02-14 22:35:54 -0800 |
| commit | 648e5523fbfc3dfbce58f66437112bc442470c87 (patch) | |
| tree | 6ead7871ba1026168c7f7c4d1f4cffa5241f864b /src/lisp.h | |
| parent | dec2a322921d74de8f251a54931d4c50ab00713d (diff) | |
| parent | 974c7646ec5b2985a50007c9d599154d667df349 (diff) | |
| download | emacs-648e5523fbfc3dfbce58f66437112bc442470c87.tar.gz | |
Merge from emacs-24; up to 2012-12-19T13:01:16Z!michael.albinus@gmx.de
Diffstat (limited to 'src/lisp.h')
| -rw-r--r-- | src/lisp.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/lisp.h b/src/lisp.h index 37d2b45e85b..da1531cc1be 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -505,13 +505,9 @@ static EMACS_INT const VALMASK (XIL ((EMACS_INT) ((EMACS_UINT) (type) << VALBITS) \ + ((intptr_t) (ptr) & VALMASK))) -#if DATA_SEG_BITS /* DATA_SEG_BITS forces extra bits to be or'd in with any pointers which were stored in a Lisp_Object. */ #define XPNTR(a) ((uintptr_t) ((XLI (a) & VALMASK)) | DATA_SEG_BITS)) -#else -#define XPNTR(a) ((uintptr_t) (XLI (a) & VALMASK)) -#endif #endif /* not USE_LSB_TAG */ |