comparison src/opaque.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 e0db3c197671
comparison
equal deleted inserted replaced
3016:f252275fb013 3017:1e7cc382eb16
26 #ifndef INCLUDED_opaque_h_ 26 #ifndef INCLUDED_opaque_h_
27 #define INCLUDED_opaque_h_ 27 #define INCLUDED_opaque_h_
28 28
29 typedef struct Lisp_Opaque 29 typedef struct Lisp_Opaque
30 { 30 {
31 #ifdef MC_ALLOC 31 struct LCRECORD_HEADER header;
32 struct lrecord_header header;
33 #else /* MC_ALLOC */
34 struct lcrecord_header header;
35 #endif /* MC_ALLOC */
36 Bytecount size; 32 Bytecount size;
37 max_align_t data[1]; 33 max_align_t data[1];
38 } Lisp_Opaque; 34 } Lisp_Opaque;
39 35
40 DECLARE_LRECORD (opaque, Lisp_Opaque); 36 DECLARE_LRECORD (opaque, Lisp_Opaque);
56 52
57 Lisp_Object make_opaque (const void *data, Bytecount size); 53 Lisp_Object make_opaque (const void *data, Bytecount size);
58 54
59 typedef struct Lisp_Opaque_Ptr 55 typedef struct Lisp_Opaque_Ptr
60 { 56 {
61 #ifdef MC_ALLOC 57 struct LCRECORD_HEADER header;
62 struct lrecord_header header;
63 #else /* MC_ALLOC */
64 struct lcrecord_header header;
65 #endif /* MC_ALLOC */
66 void *ptr; 58 void *ptr;
67 } Lisp_Opaque_Ptr; 59 } Lisp_Opaque_Ptr;
68 60
69 DECLARE_LRECORD (opaque_ptr, Lisp_Opaque_Ptr); 61 DECLARE_LRECORD (opaque_ptr, Lisp_Opaque_Ptr);
70 #define XOPAQUE_PTR(x) XRECORD (x, opaque_ptr, Lisp_Opaque_Ptr) 62 #define XOPAQUE_PTR(x) XRECORD (x, opaque_ptr, Lisp_Opaque_Ptr)