Mercurial > hg > xemacs-beta

diff src/glyphs.c @ 3017:1e7cc382eb16

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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 4eb2a8c07cb3
children 141c2920ea48 3742ea8250b5
line wrap: on
line diff
--- a/src/glyphs.c	Mon Oct 24 08:12:59 2005 +0000
+++ b/src/glyphs.c	Mon Oct 24 10:07:42 2005 +0000
@@ -1326,11 +1326,7 @@
 			 Lisp_Object instantiator)
 {
   Lisp_Image_Instance *lp =
-#ifdef MC_ALLOC
-    alloc_lrecord_type (Lisp_Image_Instance, &lrecord_image_instance);
-#else /* not MC_ALLOC */
-    alloc_lcrecord_type (Lisp_Image_Instance, &lrecord_image_instance);
-#endif /* not MC_ALLOC */
+    ALLOC_LCRECORD_TYPE (Lisp_Image_Instance, &lrecord_image_instance);
   Lisp_Object val;
 
   /* It's not possible to simply keep a record of the domain in which
@@ -1997,11 +1993,7 @@
      device-specific method to copy the window-system subobject. */
   new_ = allocate_image_instance (XIMAGE_INSTANCE_DOMAIN (image_instance),
 				 Qnil, Qnil);
-#ifdef MC_ALLOC
-  copy_lrecord (XIMAGE_INSTANCE (new_), XIMAGE_INSTANCE (image_instance));
-#else /* not MC_ALLOC */
-  copy_lcrecord (XIMAGE_INSTANCE (new_), XIMAGE_INSTANCE (image_instance));
-#endif /* not MC_ALLOC */
+  COPY_LCRECORD (XIMAGE_INSTANCE (new_), XIMAGE_INSTANCE (image_instance));
   /* note that if this method returns non-zero, this method MUST
      copy any window-system resources, so that when one image instance is
      freed, the other one is not hosed. */
@@ -3814,11 +3806,7 @@
 {
   /* This function can GC */
   Lisp_Object obj = Qnil;
-#ifdef MC_ALLOC
-  Lisp_Glyph *g = alloc_lrecord_type (Lisp_Glyph, &lrecord_glyph);
-#else /* not MC_ALLOC */
-  Lisp_Glyph *g = alloc_lcrecord_type (Lisp_Glyph, &lrecord_glyph);
-#endif /* not MC_ALLOC */
+  Lisp_Glyph *g = ALLOC_LCRECORD_TYPE (Lisp_Glyph, &lrecord_glyph);
 
   g->type = type;
   g->image = Fmake_specifier (Qimage); /* This function can GC */