diff options
| author | Andreas Schwab | 2012-06-13 15:40:48 +0200 |
|---|---|---|
| committer | Andreas Schwab | 2012-06-13 15:40:48 +0200 |
| commit | 646b5f55dfc28ea37a6605b060f67017cdb1aea8 (patch) | |
| tree | 877cf977e28772931f3d9f3c6cdd05501efeb7c7 /src/frame.c | |
| parent | ef62b23df5a7007c3d8c74dbca87ba83e9da682e (diff) | |
| download | emacs-646b5f55dfc28ea37a6605b060f67017cdb1aea8.tar.gz emacs-646b5f55dfc28ea37a6605b060f67017cdb1aea8.zip | |
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/frame.c')
| -rw-r--r-- | src/frame.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/frame.c b/src/frame.c index 744485d4615..39d26ded5a6 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -1152,10 +1152,6 @@ other_visible_frames (FRAME_PTR f) | |||
| 1152 | described for Fdelete_frame. */ | 1152 | described for Fdelete_frame. */ |
| 1153 | Lisp_Object | 1153 | Lisp_Object |
| 1154 | delete_frame (Lisp_Object frame, Lisp_Object force) | 1154 | delete_frame (Lisp_Object frame, Lisp_Object force) |
| 1155 | /* If we use `register' here, gcc-4.0.2 on amd64 using | ||
| 1156 | -DUSE_LISP_UNION_TYPE complains further down that we're getting the | ||
| 1157 | address of `force'. Go figure. */ | ||
| 1158 | |||
| 1159 | { | 1155 | { |
| 1160 | struct frame *f; | 1156 | struct frame *f; |
| 1161 | struct frame *sf = SELECTED_FRAME (); | 1157 | struct frame *sf = SELECTED_FRAME (); |