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/xfont.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/xfont.c')
| -rw-r--r-- | src/xfont.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xfont.c b/src/xfont.c index bde76c0ba3c..cc06e27fe02 100644 --- a/src/xfont.c +++ b/src/xfont.c | |||
| @@ -132,7 +132,7 @@ static int xfont_check (FRAME_PTR, struct font *); | |||
| 132 | 132 | ||
| 133 | struct font_driver xfont_driver = | 133 | struct font_driver xfont_driver = |
| 134 | { | 134 | { |
| 135 | 0, /* Qx */ | 135 | LISP_INITIALLY_ZERO, /* Qx */ |
| 136 | 0, /* case insensitive */ | 136 | 0, /* case insensitive */ |
| 137 | xfont_get_cache, | 137 | xfont_get_cache, |
| 138 | xfont_list, | 138 | xfont_list, |