Mercurial > hg > xemacs-beta
diff src/window.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 | 05d62157e048 |
| children | b7f26b2f78bd |
line wrap: on
line diff
--- a/src/window.c Mon Oct 24 08:12:59 2005 +0000 +++ b/src/window.c Mon Oct 24 10:07:42 2005 +0000 @@ -346,11 +346,7 @@ Lisp_Object allocate_window (void) { -#ifdef MC_ALLOC - struct window *p = alloc_lrecord_type (struct window, &lrecord_window); -#else /* not MC_ALLOC */ - struct window *p = alloc_lcrecord_type (struct window, &lrecord_window); -#endif /* not MC_ALLOC */ + struct window *p = ALLOC_LCRECORD_TYPE (struct window, &lrecord_window); Lisp_Object val = wrap_window (p); #define WINDOW_SLOT(slot) p->slot = Qnil; @@ -487,11 +483,7 @@ new_window_mirror (struct frame *f) { struct window_mirror *t = -#ifdef MC_ALLOC - alloc_lrecord_type (struct window_mirror, &lrecord_window_mirror); -#else /* not MC_ALLOC */ - alloc_lcrecord_type (struct window_mirror, &lrecord_window_mirror); -#endif /* not MC_ALLOC */ + ALLOC_LCRECORD_TYPE (struct window_mirror, &lrecord_window_mirror); t->frame = f; t->current_display_lines = Dynarr_new (display_line); @@ -3810,18 +3802,10 @@ { Lisp_Object new; struct window *o = XWINDOW (window); -#ifdef MC_ALLOC - struct window *p = alloc_lrecord_type (struct window, &lrecord_window); -#else /* not MC_ALLOC */ - struct window *p = alloc_lcrecord_type (struct window, &lrecord_window); -#endif /* not MC_ALLOC */ + struct window *p = ALLOC_LCRECORD_TYPE (struct window, &lrecord_window); new = wrap_window (p); -#ifdef MC_ALLOC - copy_lrecord (p, o); -#else /* MC_ALLOC */ - copy_lcrecord (p, o); -#endif /* MC_ALLOC */ + COPY_LCRECORD (p, o); /* Don't copy the pointers to the line start cache or the face instances. */ @@ -5112,13 +5096,8 @@ { if (!mir) return; -#ifdef MC_ALLOC - stats->other += mc_alloced_storage_size (sizeof (struct window_mirror), - ovstats); -#else /* not MC_ALLOC */ - stats->other += malloced_storage_size (mir, sizeof (struct window_mirror), + stats->other += MALLOCED_STORAGE_SIZE (mir, sizeof (struct window_mirror), ovstats); -#endif /* not MC_ALLOC */ #ifdef HAVE_SCROLLBARS { struct device *d = XDEVICE (FRAME_DEVICE (mir->frame)); @@ -5142,11 +5121,7 @@ struct overhead_stats *ovstats) { xzero (*stats); -#ifdef MC_ALLOC - stats->other += mc_alloced_storage_size (sizeof (struct window), ovstats); -#else /* not MC_ALLOC */ - stats->other += malloced_storage_size (w, sizeof (struct window), ovstats); -#endif /* not MC_ALLOC */ + stats->other += MALLOCED_STORAGE_SIZE (w, sizeof (struct window), ovstats); stats->face += compute_face_cachel_usage (w->face_cachels, ovstats); stats->glyph += compute_glyph_cachel_usage (w->glyph_cachels, ovstats); stats->line_start +=