[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/mule-charset.c	Mon Oct 24 08:12:59 2005 +0000
+++ b/src/mule-charset.c	Mon Oct 24 10:07:42 2005 +0000
@@ -197,11 +197,7 @@
 
   if (!overwrite)
     {
-#ifdef MC_ALLOC
-      cs = alloc_lrecord_type (Lisp_Charset, &lrecord_charset);
-#else /* not MC_ALLOC */
-      cs = alloc_lcrecord_type (Lisp_Charset, &lrecord_charset);
-#endif /* not MC_ALLOC */
+      cs = ALLOC_LCRECORD_TYPE (Lisp_Charset, &lrecord_charset);
       obj = wrap_charset (cs);
 
       if (final)
@@ -884,11 +880,7 @@
 {
   struct Lisp_Charset *c = XCHARSET (charset);
   xzero (*stats);
-#ifdef MC_ALLOC
-  stats->other   += mc_alloced_storage_size (sizeof (*c), ovstats);
-#else /* not MC_ALLOC */
-  stats->other   += malloced_storage_size (c, sizeof (*c), ovstats);
-#endif /* not MC_ALLOC */
+  stats->other   += MALLOCED_STORAGE_SIZE (c, sizeof (*c), ovstats);
   stats->from_unicode += compute_from_unicode_table_size (charset, ovstats);
   stats->to_unicode += compute_to_unicode_table_size (charset, ovstats);
 }