aboutsummaryrefslogtreecommitdiffstats
path: root/src/lread.c
diff options
context:
space:
mode:
authorPaul Eggert2015-01-10 13:33:38 -0800
committerPaul Eggert2015-01-10 13:42:35 -0800
commit6a37ecee0884ff30ac7666e6502e2a9d2608f291 (patch)
tree875bd8310981ff850911f04da4c3c3b95f34537b /src/lread.c
parent649937920b5023be5c0685d1537f5ea2bfb9899a (diff)
downloademacs-6a37ecee0884ff30ac7666e6502e2a9d2608f291.tar.gz
emacs-6a37ecee0884ff30ac7666e6502e2a9d2608f291.zip
Port to 32-bit --with-wide-int
Prefer symbol indexes to struct Lisp_Symbol * casted and then widened, as the latter had trouble with GCC on Fedora 21 when configured --with-wide-int and when used in static initializers. * lib-src/make-docfile.c (write_globals): Define and use symbols like iQnil (a small integer, like 0) rather than aQnil (an address constant). * src/alloc.c (garbage_collect_1, which_symbols): * src/lread.c (init_obarray): Prefer builtin_lisp_symbol when it can be used. * src/dispextern.h (struct image_type.type): * src/font.c (font_property_table.key): * src/frame.c (struct frame_parm_table.sym): * src/keyboard.c (scroll_bar_parts, struct event_head): * src/xdisp.c (struct props.name): Use the index of a builtin symbol rather than its address. All uses changed. * src/lisp.h (TAG_SYMPTR, XSYMBOL_INIT): Remove, replacing with ... (TAG_SYMOFFSET, SYMBOL_INDEX): ... new macros that deal with symbol indexes rather than pointers, and which work better on MSB hosts because they shift right before tagging. All uses changed. (DEFINE_LISP_SYMBOL_BEGIN, DEFINE_LISP_SYMBOL_END): No longer noops on wide-int hosts, since they work now. (builtin_lisp_symbol): New function.
Diffstat (limited to 'src/lread.c')
-rw-r--r--src/lread.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lread.c b/src/lread.c
index 324052462fe..7f7bd8985d9 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -4058,7 +4058,7 @@ init_obarray (void)
4058 staticpro (&initial_obarray); 4058 staticpro (&initial_obarray);
4059 4059
4060 for (int i = 0; i < ARRAYELTS (lispsym); i++) 4060 for (int i = 0; i < ARRAYELTS (lispsym); i++)
4061 define_symbol (make_lisp_symbol (&lispsym[i]), defsym_name[i]); 4061 define_symbol (builtin_lisp_symbol (i), defsym_name[i]);
4062 4062
4063 DEFSYM (Qunbound, "unbound"); 4063 DEFSYM (Qunbound, "unbound");
4064 4064