Mercurial > hg > xemacs-beta

comparison src/mule-charset.c @ 3017:1e7cc382eb16

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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
comparison
equal deleted inserted replaced
3016:f252275fb013 3017:1e7cc382eb16
195 Lisp_Object obj; 195 Lisp_Object obj;
196 Lisp_Charset *cs; 196 Lisp_Charset *cs;
197 197
198 if (!overwrite) 198 if (!overwrite)
199 { 199 {
200 #ifdef MC_ALLOC 200 cs = ALLOC_LCRECORD_TYPE (Lisp_Charset, &lrecord_charset);
201 cs = alloc_lrecord_type (Lisp_Charset, &lrecord_charset);
202 #else /* not MC_ALLOC */
203 cs = alloc_lcrecord_type (Lisp_Charset, &lrecord_charset);
204 #endif /* not MC_ALLOC */
205 obj = wrap_charset (cs); 201 obj = wrap_charset (cs);
206 202
207 if (final) 203 if (final)
208 { 204 {
209 /* some charsets do not have final characters. This includes 205 /* some charsets do not have final characters. This includes
882 compute_charset_usage (Lisp_Object charset, struct charset_stats *stats, 878 compute_charset_usage (Lisp_Object charset, struct charset_stats *stats,
883 struct overhead_stats *ovstats) 879 struct overhead_stats *ovstats)
884 { 880 {
885 struct Lisp_Charset *c = XCHARSET (charset); 881 struct Lisp_Charset *c = XCHARSET (charset);
886 xzero (*stats); 882 xzero (*stats);
887 #ifdef MC_ALLOC 883 stats->other += MALLOCED_STORAGE_SIZE (c, sizeof (*c), ovstats);
888 stats->other += mc_alloced_storage_size (sizeof (*c), ovstats);
889 #else /* not MC_ALLOC */
890 stats->other += malloced_storage_size (c, sizeof (*c), ovstats);
891 #endif /* not MC_ALLOC */
892 stats->from_unicode += compute_from_unicode_table_size (charset, ovstats); 884 stats->from_unicode += compute_from_unicode_table_size (charset, ovstats);
893 stats->to_unicode += compute_to_unicode_table_size (charset, ovstats); 885 stats->to_unicode += compute_to_unicode_table_size (charset, ovstats);
894 } 886 }
895 887
896 DEFUN ("charset-memory-usage", Fcharset_memory_usage, 1, 1, 0, /* 888 DEFUN ("charset-memory-usage", Fcharset_memory_usage, 1, 1, 0, /*