Mercurial > hg > xemacs-beta
diff src/symbols.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 | ec5f23ea6d2e |
| children | b7f26b2f78bd |
line wrap: on
line diff
--- a/src/symbols.c Mon Oct 24 08:12:59 2005 +0000 +++ b/src/symbols.c Mon Oct 24 10:07:42 2005 +0000 @@ -2187,13 +2187,8 @@ { struct symbol_value_buffer_local *bfwd -#ifdef MC_ALLOC - = alloc_lrecord_type (struct symbol_value_buffer_local, - &lrecord_symbol_value_buffer_local); -#else /* not MC_ALLOC */ - = alloc_lcrecord_type (struct symbol_value_buffer_local, + = ALLOC_LCRECORD_TYPE (struct symbol_value_buffer_local, &lrecord_symbol_value_buffer_local); -#endif /* not MC_ALLOC */ Lisp_Object foo; bfwd->magic.type = SYMVAL_BUFFER_LOCAL; @@ -2300,13 +2295,8 @@ } /* Make sure variable is set up to hold per-buffer values */ -#ifdef MC_ALLOC - bfwd = alloc_lrecord_type (struct symbol_value_buffer_local, - &lrecord_symbol_value_buffer_local); -#else /* not MC_ALLOC */ - bfwd = alloc_lcrecord_type (struct symbol_value_buffer_local, + bfwd = ALLOC_LCRECORD_TYPE (struct symbol_value_buffer_local, &lrecord_symbol_value_buffer_local); -#endif /* not MC_ALLOC */ bfwd->magic.type = SYMVAL_SOME_BUFFER_LOCAL; bfwd->current_buffer = Qnil; @@ -3025,13 +3015,8 @@ valcontents = XSYMBOL (variable)->value; if (!SYMBOL_VALUE_LISP_MAGIC_P (valcontents)) { -#ifdef MC_ALLOC - bfwd = alloc_lrecord_type (struct symbol_value_lisp_magic, - &lrecord_symbol_value_lisp_magic); -#else /* MC_ALLOC */ - bfwd = alloc_lcrecord_type (struct symbol_value_lisp_magic, + bfwd = ALLOC_LCRECORD_TYPE (struct symbol_value_lisp_magic, &lrecord_symbol_value_lisp_magic); -#endif /* not MC_ALLOC */ bfwd->magic.type = SYMVAL_LISP_MAGIC; for (i = 0; i < MAGIC_HANDLER_MAX; i++) { @@ -3166,13 +3151,8 @@ invalid_change ("Variable is magic and cannot be aliased", variable); reject_constant_symbols (variable, Qunbound, 0, Qt); -#ifdef MC_ALLOC - bfwd = alloc_lrecord_type (struct symbol_value_varalias, - &lrecord_symbol_value_varalias); -#else /* not MC_ALLOC */ - bfwd = alloc_lcrecord_type (struct symbol_value_varalias, + bfwd = ALLOC_LCRECORD_TYPE (struct symbol_value_varalias, &lrecord_symbol_value_varalias); -#endif /* not MC_ALLOC */ bfwd->magic.type = SYMVAL_VARALIAS; bfwd->aliasee = alias; bfwd->shadowed = valcontents;