[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).

--- a/src/scrollbar.c	Mon Oct 24 08:12:59 2005 +0000
+++ b/src/scrollbar.c	Mon Oct 24 10:07:42 2005 +0000
@@ -199,13 +199,8 @@
 {
   struct device *d = XDEVICE (f->device);
   struct scrollbar_instance *instance =
-#ifdef MC_ALLOC
-    alloc_lrecord_type (struct scrollbar_instance,
-			&lrecord_scrollbar_instance);
-#else /* not MC_ALLOC */
-    alloc_lcrecord_type (struct scrollbar_instance,
+    ALLOC_LCRECORD_TYPE (struct scrollbar_instance,
 			 &lrecord_scrollbar_instance);
-#endif /* not MC_ALLOC */
 
   MAYBE_DEVMETH (d, create_scrollbar_instance, (f, vertical, instance));
 
@@ -277,11 +272,7 @@
 
   while (inst)
     {
-#ifdef MC_ALLOC
-      total += mc_alloced_storage_size (sizeof (*inst), ovstats);
-#else /* not MC_ALLOC */
-      total += malloced_storage_size (inst, sizeof (*inst), ovstats);
-#endif /* not MC_ALLOC */
+      total += MALLOCED_STORAGE_SIZE (inst, sizeof (*inst), ovstats);
       inst = inst->next;
     }