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 /admin/make-emacs | |
| parent | ef62b23df5a7007c3d8c74dbca87ba83e9da682e (diff) | |
| download | emacs-646b5f55dfc28ea37a6605b060f67017cdb1aea8.tar.gz | |
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 'admin/make-emacs')
| -rwxr-xr-x | admin/make-emacs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/admin/make-emacs b/admin/make-emacs index f64d51b0c41..688f5c196bf 100755 --- a/admin/make-emacs +++ b/admin/make-emacs @@ -42,7 +42,7 @@ $rc = GetOptions ("help" => \$help, "check-marked" => \$check_marked, "all" => \$all, "no-optim" => \$no_optim, - "union-type" => \$union_type, + "check-lisp-type" => \$check_lisp_type, "gprof" => \$profile, "malloc-check" => \$malloc_check, "no-mcheck" => \$no_mcheck, @@ -70,7 +70,7 @@ Build Emacs. --check-marked GC_CHECK_MARKED_OBJECTS=1 --optim no debug defines --gprof make Emacs for profiling - --union-type define USE_LISP_UNION_TYPE (bad for GDB) + --check-lisp-type define CHECK_LISP_OBJECT_TYPE --malloc-check define GC_MALLOC_CHECK --no-mcheck don't define GC_MCHECK --wall compile with -Wall @@ -140,7 +140,7 @@ else } } -$defs = "$defs -DUSE_LISP_UNION_TYPE" if $union_type; +$defs = "$defs -DCHECK_LISP_OBJECT_TYPE" if $check_lisp_type; $defs = "$defs -DGC_MALLOC_CHECK=1 -DGC_PROTECT_MALLOC_STATE=1" if $malloc_check; $defs = "$defs -DGC_MCHECK=1" unless $no_mcheck; |