diff options
| author | Paul Eggert | 2012-06-12 17:26:40 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-06-12 17:26:40 -0700 |
| commit | bfe3e0a23e66d16bfcaae6890bdd764dec0525f2 (patch) | |
| tree | 77a2c28772dffde4a5f0c8fc55d81701c29f11bb /src/data.c | |
| parent | 1cce69208a638b9ce789e4c21df55b2315efd97c (diff) | |
| download | emacs-bfe3e0a23e66d16bfcaae6890bdd764dec0525f2.tar.gz emacs-bfe3e0a23e66d16bfcaae6890bdd764dec0525f2.zip | |
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/data.c')
| -rw-r--r-- | src/data.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/data.c b/src/data.c index defcd06a2ed..4449977dbe0 100644 --- a/src/data.c +++ b/src/data.c | |||
| @@ -1500,7 +1500,7 @@ The function `default-value' gets the default value and `set-default' sets it. | |||
| 1500 | { | 1500 | { |
| 1501 | struct Lisp_Symbol *sym; | 1501 | struct Lisp_Symbol *sym; |
| 1502 | struct Lisp_Buffer_Local_Value *blv = NULL; | 1502 | struct Lisp_Buffer_Local_Value *blv = NULL; |
| 1503 | union Lisp_Val_Fwd valcontents IF_LINT (= {0}); | 1503 | union Lisp_Val_Fwd valcontents IF_LINT (= {LISP_INITIALLY_ZERO}); |
| 1504 | int forwarded IF_LINT (= 0); | 1504 | int forwarded IF_LINT (= 0); |
| 1505 | 1505 | ||
| 1506 | CHECK_SYMBOL (variable); | 1506 | CHECK_SYMBOL (variable); |
| @@ -1577,7 +1577,7 @@ Instead, use `add-hook' and specify t for the LOCAL argument. */) | |||
| 1577 | { | 1577 | { |
| 1578 | register Lisp_Object tem; | 1578 | register Lisp_Object tem; |
| 1579 | int forwarded IF_LINT (= 0); | 1579 | int forwarded IF_LINT (= 0); |
| 1580 | union Lisp_Val_Fwd valcontents IF_LINT (= {0}); | 1580 | union Lisp_Val_Fwd valcontents IF_LINT (= {LISP_INITIALLY_ZERO}); |
| 1581 | struct Lisp_Symbol *sym; | 1581 | struct Lisp_Symbol *sym; |
| 1582 | struct Lisp_Buffer_Local_Value *blv = NULL; | 1582 | struct Lisp_Buffer_Local_Value *blv = NULL; |
| 1583 | 1583 | ||