diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-06-12 17:26:40 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-06-12 17:26:40 -0700 |
| commit | bfe3e0a23e66d16bfcaae6890bdd764dec0525f2 (patch) | |
| tree | 77a2c28772dffde4a5f0c8fc55d81701c29f11bb /src/w32heap.c | |
| parent | 1cce69208a638b9ce789e4c21df55b2315efd97c (diff) | |
USE_LISP_UNION_TYPE + USE_LSB_TAG cleanup (Bug#11604)
* alloc.c (make_number) [!defined make_number]:
Remove, as lisp.h always defines this now.
(mark_maybe_pointer): Simplify since USE_LSB_TAG is always defined now.
(roundup_size): Verify that it is a power of 2.
* data.c (Fmake_variable_buffer_local, Fmake_local_variable):
* ftfont.c (ftfont_driver): Use LISP_INITIALLY_ZERO.
* lisp.h (USE_LSB_TAG): Allow the builder to compile with
-DUSE_LSB_TAG=0, to override the automatically-selected default.
USE_LSB_TAG now is always defined to be either 0 or 1.
All uses changed.
(union Lisp_Object): Don't worry about WORDS_BIGENDIAN; the
code works fine either way, and efficiency is not a concern here,
as the union type is for debugging, not for production.
(LISP_MAKE_RVALUE, make_number) [USE_LISP_UNION_TYPE]:
Use an inline function on all platforms when using the union type,
since this is simpler and 'static inline' can be used portably
within Emacs now.
(LISP_INITIALLY_ZERO): New macro.
(XFASTINT, XSETFASTINT) [USE_LISP_UNION_TYPE]: Remove.
(XSET) [USE_LISP_UNION_TYPE]: Don't overparenthesize.
Diffstat (limited to 'src/w32heap.c')
| -rw-r--r-- | src/w32heap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/w32heap.c b/src/w32heap.c index da8579896f..00572b20ae 100644 --- a/src/w32heap.c +++ b/src/w32heap.c @@ -114,7 +114,7 @@ get_data_end (void) return data_region_end; } -#if !defined (USE_LISP_UNION_TYPE) && !defined (USE_LSB_TAG) +#if !defined USE_LISP_UNION_TYPE && !USE_LSB_TAG static char * allocate_heap (void) { @@ -259,7 +259,7 @@ init_heap (void) exit (1); } -#if !defined (USE_LISP_UNION_TYPE) && !defined (USE_LSB_TAG) +#if !defined USE_LISP_UNION_TYPE && !USE_LSB_TAG /* Ensure that the addresses don't use the upper tag bits since the Lisp type goes there. */ if (((unsigned long) data_region_base & ~VALMASK) != 0) |