comparison src/objects-impl.h @ 3017:1e7cc382eb16

[xemacs-hg @ 2005-10-24 10:07:26 by ben] refactor mc-alloc dependencies next-error.el, occur.el: Fix some byte-compile warnings. alloc.c, buffer.c, buffer.h, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, console-impl.h, console-msw-impl.h, console.c, data.c, database.c, device-impl.h, device-msw.c, device.c, dialog-msw.c, elhash.c, events.h, extents-impl.h, extents.c, faces.c, faces.h, file-coding.c, file-coding.h, frame-impl.h, frame.c, glyphs.c, glyphs.h, gui.c, gui.h, keymap.c, lisp.h, lrecord.h, lstream.c, lstream.h, mule-charset.c, objects-impl.h, objects.c, opaque.c, opaque.h, print.c, process.c, procimpl.h, rangetab.c, rangetab.h, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, scrollbar.h, specifier.c, specifier.h, symbols.c, symeval.h, toolbar.c, toolbar.h, tooltalk.c, ui-gtk.c, ui-gtk.h, unicode.c, window-impl.h, window.c: Eliminate the majority of #ifdef MC_ALLOC occurrences through macros LCRECORD_HEADER, ALLOC_LCRECORD_TYPE, MALLOCED_STORAGE_SIZE, etc. (defined in lrecord.h).
author ben
date Mon, 24 Oct 2005 10:07:42 +0000
parents 6fa9919a9a0b
children ad2f4ae9895b
comparison
equal deleted inserted replaced
3016:f252275fb013 3017:1e7cc382eb16
97 * Color Instance Object * 97 * Color Instance Object *
98 ****************************************************************************/ 98 ****************************************************************************/
99 99
100 struct Lisp_Color_Instance 100 struct Lisp_Color_Instance
101 { 101 {
102 #ifdef MC_ALLOC 102 struct LCRECORD_HEADER header;
103 struct lrecord_header header;
104 #else /* MC_ALLOC */
105 struct lcrecord_header header;
106 #endif /* MC_ALLOC */
107 Lisp_Object name; 103 Lisp_Object name;
108 Lisp_Object device; 104 Lisp_Object device;
109 105
110 /* See comment in struct console about console variants. */ 106 /* See comment in struct console about console variants. */
111 enum console_variant color_instance_type; 107 enum console_variant color_instance_type;
121 * Font Instance Object * 117 * Font Instance Object *
122 ****************************************************************************/ 118 ****************************************************************************/
123 119
124 struct Lisp_Font_Instance 120 struct Lisp_Font_Instance
125 { 121 {
126 #ifdef MC_ALLOC 122 struct LCRECORD_HEADER header;
127 struct lrecord_header header;
128 #else /* MC_ALLOC */
129 struct lcrecord_header header;
130 #endif /* MC_ALLOC */
131 Lisp_Object name; /* the instantiator used to create the font instance */ 123 Lisp_Object name; /* the instantiator used to create the font instance */
132 Lisp_Object truename; /* used by the device-specific methods; we need to 124 Lisp_Object truename; /* used by the device-specific methods; we need to
133 call them to get the truename (#### in reality, 125 call them to get the truename (#### in reality,
134 they all probably just store the truename here 126 they all probably just store the truename here
135 if they know it, and nil otherwise; we should 127 if they know it, and nil otherwise; we should