diff src/ui-gtk.c @ 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 3742ea8250b5
line wrap: on
line diff
--- a/src/ui-gtk.c	Mon Oct 24 08:12:59 2005 +0000
+++ b/src/ui-gtk.c	Mon Oct 24 10:07:42 2005 +0000
@@ -280,11 +280,7 @@
 static emacs_ffi_data *
 allocate_ffi_data (void)
 {
-#ifdef MC_ALLOC
-  emacs_ffi_data *data = alloc_lrecord_type (emacs_ffi_data, &lrecord_emacs_ffi);
-#else /* not MC_ALLOC */
-  emacs_ffi_data *data = alloc_lcrecord_type (emacs_ffi_data, &lrecord_emacs_ffi);
-#endif /* not MC_ALLOC */
+  emacs_ffi_data *data = ALLOC_LCRECORD_TYPE (emacs_ffi_data, &lrecord_emacs_ffi);
 
   data->return_type = GTK_TYPE_NONE;
   data->n_args = 0;
@@ -948,13 +944,8 @@
 static emacs_gtk_object_data *
 allocate_emacs_gtk_object_data (void)
 {
-#ifdef MC_ALLOC
-  emacs_gtk_object_data *data = alloc_lrecord_type (emacs_gtk_object_data,
-						    &lrecord_emacs_gtk_object);
-#else /* not MC_ALLOC */
-  emacs_gtk_object_data *data = alloc_lcrecord_type (emacs_gtk_object_data,
+  emacs_gtk_object_data *data = ALLOC_LCRECORD_TYPE (emacs_gtk_object_data,
 						     &lrecord_emacs_gtk_object);
-#endif /* not MC_ALLOC */
 
   data->object = NULL;
   data->alive_p = FALSE;
@@ -1162,13 +1153,8 @@
 static emacs_gtk_boxed_data *
 allocate_emacs_gtk_boxed_data (void)
 {
-#ifdef MC_ALLOC
-  emacs_gtk_boxed_data *data = alloc_lrecord_type (emacs_gtk_boxed_data,
-						   &lrecord_emacs_gtk_boxed);
-#else /* not MC_ALLOC */
-  emacs_gtk_boxed_data *data = alloc_lcrecord_type (emacs_gtk_boxed_data,
+  emacs_gtk_boxed_data *data = ALLOC_LCRECORD_TYPE (emacs_gtk_boxed_data,
 						    &lrecord_emacs_gtk_boxed);
-#endif /* not MC_ALLOC */
 
   data->object = NULL;
   data->object_type = GTK_TYPE_INVALID;