Mercurial > hg > xemacs-beta
diff src/mule-charset.c @ 5133:444a448b2f53
Merge branch ben-lisp-object into default branch
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Sun, 07 Mar 2010 06:47:37 -0600 |
| parents | a9c41067dd88 |
| children | f965e31a35f0 |
line wrap: on
line diff
--- a/src/mule-charset.c Sun Mar 07 06:43:19 2010 -0600 +++ b/src/mule-charset.c Sun Mar 07 06:47:37 2010 -0600 @@ -1,7 +1,7 @@ /* Functions to handle multilingual characters. Copyright (C) 1992, 1995 Free Software Foundation, Inc. Copyright (C) 1995 Sun Microsystems, Inc. - Copyright (C) 2001, 2002, 2004, 2005 Ben Wing. + Copyright (C) 2001, 2002, 2004, 2005, 2010 Ben Wing. This file is part of XEmacs. @@ -178,10 +178,9 @@ { XD_END } }; -DEFINE_LRECORD_IMPLEMENTATION ("charset", charset, - 1, /* dumpable flag */ - mark_charset, print_charset, 0, - 0, 0, charset_description, Lisp_Charset); +DEFINE_DUMPABLE_LISP_OBJECT ("charset", charset, + mark_charset, print_charset, 0, + 0, 0, charset_description, Lisp_Charset); /* Make a new charset. */ /* #### SJT Should generic properties be allowed? */ static Lisp_Object @@ -196,8 +195,8 @@ if (!overwrite) { - cs = ALLOC_LCRECORD_TYPE (Lisp_Charset, &lrecord_charset); - obj = wrap_charset (cs); + obj = ALLOC_NORMAL_LISP_OBJECT (charset); + cs = XCHARSET (obj); if (final) { @@ -1000,9 +999,8 @@ compute_charset_usage (Lisp_Object charset, struct charset_stats *stats, struct overhead_stats *ovstats) { - struct Lisp_Charset *c = XCHARSET (charset); xzero (*stats); - stats->other += LISPOBJ_STORAGE_SIZE (c, sizeof (*c), ovstats); + stats->other += lisp_object_storage_size (charset, ovstats); stats->from_unicode += compute_from_unicode_table_size (charset, ovstats); stats->to_unicode += compute_to_unicode_table_size (charset, ovstats); } @@ -1055,7 +1053,7 @@ void syms_of_mule_charset (void) { - INIT_LRECORD_IMPLEMENTATION (charset); + INIT_LISP_OBJECT (charset); DEFSUBR (Fcharsetp); DEFSUBR (Ffind_charset);