Mercurial > hg > xemacs-beta

diff src/extents.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 0e0af7cbfd1b
children facf3239ba30
line wrap: on
line diff
--- a/src/extents.c	Mon Oct 24 08:12:59 2005 +0000
+++ b/src/extents.c	Mon Oct 24 10:07:42 2005 +0000
@@ -986,17 +986,9 @@
 allocate_extent_auxiliary (EXTENT ext)
 {
   Lisp_Object extent_aux;
-#ifdef MC_ALLOC
   struct extent_auxiliary *data =
-    alloc_lrecord_type (struct extent_auxiliary, &lrecord_extent_auxiliary);
-
-  copy_lrecord (data, &extent_auxiliary_defaults);
-#else /* not MC_ALLOC */
-  struct extent_auxiliary *data =
-    alloc_lcrecord_type (struct extent_auxiliary, &lrecord_extent_auxiliary);
-
-  copy_lcrecord (data, &extent_auxiliary_defaults);
-#endif /* not MC_ALLOC */
+    ALLOC_LCRECORD_TYPE (struct extent_auxiliary, &lrecord_extent_auxiliary);
+  COPY_LCRECORD (data, &extent_auxiliary_defaults);
   extent_aux = wrap_extent_auxiliary (data);
   ext->plist = Fcons (extent_aux, ext->plist);
   ext->flags.has_aux = 1;
@@ -1174,11 +1166,7 @@
 {
   Lisp_Object extent_info;
   struct extent_info *data =
-#ifdef MC_ALLOC
-    alloc_lrecord_type (struct extent_info, &lrecord_extent_info);
-#else /* not MC_ALLOC */
-    alloc_lcrecord_type (struct extent_info, &lrecord_extent_info);
-#endif /* not MC_ALLOC */
+    ALLOC_LCRECORD_TYPE (struct extent_info, &lrecord_extent_info);
 
   extent_info = wrap_extent_info (data);
   data->extents = allocate_extent_list ();
@@ -3909,19 +3897,11 @@
       /* also need to copy the aux struct.  It won't work for
 	 this extent to share the same aux struct as the original
 	 one. */
-#ifdef MC_ALLOC
       struct extent_auxiliary *data =
-	alloc_lrecord_type (struct extent_auxiliary,
-			    &lrecord_extent_auxiliary);
-
-      copy_lrecord (data, XEXTENT_AUXILIARY (XCAR (original->plist)));
-#else /* not MC_ALLOC */
-      struct extent_auxiliary *data =
-	alloc_lcrecord_type (struct extent_auxiliary,
+	ALLOC_LCRECORD_TYPE (struct extent_auxiliary,
 			     &lrecord_extent_auxiliary);
 
-      copy_lcrecord (data, XEXTENT_AUXILIARY (XCAR (original->plist)));
-#endif /* not MC_ALLOC */
+      COPY_LCRECORD (data, XEXTENT_AUXILIARY (XCAR (original->plist)));
       XCAR (e->plist) = wrap_extent_auxiliary (data);
     }