diff options
| author | Andreas Schwab <schwab@linux-m68k.org> | 2012-06-13 15:40:48 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@linux-m68k.org> | 2012-06-13 15:40:48 +0200 |
| commit | 646b5f55dfc28ea37a6605b060f67017cdb1aea8 (patch) | |
| tree | 877cf977e28772931f3d9f3c6cdd05501efeb7c7 /src/w32heap.c | |
| parent | ef62b23df5a7007c3d8c74dbca87ba83e9da682e (diff) | |
Use a simple struct to implement compile time checks for the Lisp_Object type
* configure.in: Rename --enable-use-lisp-union-type to
--enable-check-lisp-object-type and define CHECK_LISP_OBJECT_TYPE
instead of USE_LISP_UNION_TYPE.
* admin/make-emacs: Rename --union-type to --check-lisp-type. Define
CHECK_LISP_OBJECT_TYPE insted of USE_LISP_UNION_TYPE.
* admin/CPP-DEFINES (DEBUG_LISP_OBJECT_TYPE): Renamed from
USE_LISP_UNION_TYPE.
* src/lisp.h (Lisp_Object) [CHECK_LISP_OBJECT_TYPE]: Define as struct
instead of union.
(XLI, XIL): Define.
(XHASH, XTYPE, XINT, XUINT, make_number, XSET, XPNTR, XUNTAG): Use
them.
* src/emacs.c (gdb_use_struct): Renamed from gdb_use_union.
* src/.gdbinit: Check gdb_use_struct instead of gdb_use_union.
* src/alloc.c (widen_to_Lisp_Object): Removed.
(mark_memory): Use XIL instead of widen_to_Lisp_Object.
* src/frame.c (delete_frame): Remove outdated comment.
* src/w32fns.c (Fw32_register_hot_key): Use XLI instead of checking
USE_LISP_UNION_TYPE.
(Fw32_unregister_hot_key): Likewise.
(Fw32_toggle_lock_key): Likewise.
* src/w32menu.c (add_menu_item): Likewise.
(w32_menu_display_help): Use XIL instead of checking
USE_LISP_UNION_TYPE.
* src/w32heap.c (allocate_heap): Don't check USE_LISP_UNION_TYPE.
(init_heap): Likewise.
* src/w32term.c (w32_read_socket): Update comment.
Diffstat (limited to 'src/w32heap.c')
| -rw-r--r-- | src/w32heap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/w32heap.c b/src/w32heap.c index 00572b20ae..cc5e5cd2bf 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 && !USE_LSB_TAG +#if !USE_LSB_TAG static char * allocate_heap (void) { @@ -141,7 +141,7 @@ allocate_heap (void) return ptr; } -#else /* USE_LISP_UNION_TYPE || USE_LSB_TAG */ +#else /* USE_LSB_TAG */ static char * allocate_heap (void) { @@ -160,7 +160,7 @@ allocate_heap (void) return ptr; } -#endif /* USE_LISP_UNION_TYPE || USE_LSB_TAG */ +#endif /* USE_LSB_TAG */ /* Emulate Unix sbrk. Note that ralloc.c expects the return value to @@ -259,7 +259,7 @@ init_heap (void) exit (1); } -#if !defined USE_LISP_UNION_TYPE && !USE_LSB_TAG +#if !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) |