comparison src/ui-gtk.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 db7068430402
comparison
equal deleted inserted replaced
3016:f252275fb013 3017:1e7cc382eb16
19 typedef void (*ffi_marshalling_function) (ffi_actual_function, GtkArg *); 19 typedef void (*ffi_marshalling_function) (ffi_actual_function, GtkArg *);
20 20
21 #define MAX_GTK_ARGS 100 21 #define MAX_GTK_ARGS 100
22 22
23 typedef struct { 23 typedef struct {
24 #ifdef MC_ALLOC 24 struct LCRECORD_HEADER header;
25 struct lrecord_header header;
26 #else /* MC_ALLOC */
27 struct lcrecord_header header;
28 #endif /* MC_ALLOC */
29 GtkType return_type; 25 GtkType return_type;
30 GtkType args[MAX_GTK_ARGS]; 26 GtkType args[MAX_GTK_ARGS];
31 gint n_args; 27 gint n_args;
32 Lisp_Object function_name; 28 Lisp_Object function_name;
33 dll_func function_ptr; 29 dll_func function_ptr;
41 #define FFIP(x) RECORDP (x, emacs_ffi) 37 #define FFIP(x) RECORDP (x, emacs_ffi)
42 #define CHECK_FFI(x) CHECK_RECORD (x, emacs_ffi) 38 #define CHECK_FFI(x) CHECK_RECORD (x, emacs_ffi)
43 39
44 /* Encapsulate a GtkObject in Lisp */ 40 /* Encapsulate a GtkObject in Lisp */
45 typedef struct { 41 typedef struct {
46 #ifdef MC_ALLOC 42 struct LCRECORD_HEADER header;
47 struct lrecord_header header;
48 #else /* MC_ALLOC */
49 struct lcrecord_header header;
50 #endif /* MC_ALLOC */
51 gboolean alive_p; 43 gboolean alive_p;
52 GtkObject *object; 44 GtkObject *object;
53 Lisp_Object plist; 45 Lisp_Object plist;
54 } emacs_gtk_object_data; 46 } emacs_gtk_object_data;
55 47
62 54
63 extern Lisp_Object build_gtk_object (GtkObject *obj); 55 extern Lisp_Object build_gtk_object (GtkObject *obj);
64 56
65 /* Encapsulate a GTK_TYPE_BOXED in lisp */ 57 /* Encapsulate a GTK_TYPE_BOXED in lisp */
66 typedef struct { 58 typedef struct {
67 #ifdef MC_ALLOC 59 struct LCRECORD_HEADER header;
68 struct lrecord_header header;
69 #else /* MC_ALLOC */
70 struct lcrecord_header header;
71 #endif /* MC_ALLOC */
72 GtkType object_type; 60 GtkType object_type;
73 void *object; 61 void *object;
74 } emacs_gtk_boxed_data; 62 } emacs_gtk_boxed_data;
75 63
76 DECLARE_LRECORD (emacs_gtk_boxed, emacs_gtk_boxed_data); 64 DECLARE_LRECORD (emacs_gtk_boxed, emacs_gtk_boxed_data);