Mercurial > hg > xemacs-beta
diff src/buffer.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 | b7f26b2f78bd |
line wrap: on
line diff
--- a/src/buffer.c Mon Oct 24 08:12:59 2005 +0000 +++ b/src/buffer.c Mon Oct 24 10:07:42 2005 +0000 @@ -587,15 +587,9 @@ static struct buffer * allocate_buffer (void) { -#ifdef MC_ALLOC - struct buffer *b = alloc_lrecord_type (struct buffer, &lrecord_buffer); - - copy_lrecord (b, XBUFFER (Vbuffer_defaults)); -#else /* not MC_ALLOC */ - struct buffer *b = alloc_lcrecord_type (struct buffer, &lrecord_buffer); - - copy_lcrecord (b, XBUFFER (Vbuffer_defaults)); -#endif /* not MC_ALLOC */ + struct buffer *b = ALLOC_LCRECORD_TYPE (struct buffer, &lrecord_buffer); + + COPY_LCRECORD (b, XBUFFER (Vbuffer_defaults)); return b; } @@ -1763,11 +1757,7 @@ struct overhead_stats *ovstats) { xzero (*stats); -#ifdef MC_ALLOC - stats->other += mc_alloced_storage_size (sizeof (*b), ovstats); -#else /* not MC_ALLOC */ - stats->other += malloced_storage_size (b, sizeof (*b), ovstats); -#endif /* not MC_ALLOC */ + stats->other += MALLOCED_STORAGE_SIZE (b, sizeof (*b), ovstats); stats->text += compute_buffer_text_usage (b, ovstats); stats->markers += compute_buffer_marker_usage (b, ovstats); stats->extents += compute_buffer_extent_usage (b, ovstats); @@ -2204,11 +2194,7 @@ static void nuke_all_buffer_slots (struct buffer *b, Lisp_Object zap) { -#ifdef MC_ALLOC - zero_lrecord (b); -#else /* not MC_ALLOC */ - zero_lcrecord (b); -#endif /* not MC_ALLOC */ + ZERO_LCRECORD (b); b->extent_info = Qnil; b->indirect_children = Qnil; @@ -2223,13 +2209,8 @@ { /* Make sure all markable slots in buffer_defaults are initialized reasonably, so mark_buffer won't choke. */ -#ifdef MC_ALLOC - struct buffer *defs = alloc_lrecord_type (struct buffer, &lrecord_buffer); - struct buffer *syms = alloc_lrecord_type (struct buffer, &lrecord_buffer); -#else /* not MC_ALLOC */ - struct buffer *defs = alloc_lcrecord_type (struct buffer, &lrecord_buffer); - struct buffer *syms = alloc_lcrecord_type (struct buffer, &lrecord_buffer); -#endif /* not MC_ALLOC */ + struct buffer *defs = ALLOC_LCRECORD_TYPE (struct buffer, &lrecord_buffer); + struct buffer *syms = ALLOC_LCRECORD_TYPE (struct buffer, &lrecord_buffer); staticpro_nodump (&Vbuffer_defaults); staticpro_nodump (&Vbuffer_local_symbols);