Mercurial > hg > xemacs-beta
diff src/objects-tty.c @ 5140:e5380fdaf8f1
merge
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Sat, 13 Mar 2010 05:38:34 -0600 |
| parents | a9c41067dd88 |
| children | 6c6d78781d59 |
line wrap: on
line diff
--- a/src/objects-tty.c Fri Mar 12 20:23:50 2010 -0600 +++ b/src/objects-tty.c Sat Mar 13 05:38:34 2010 -0600 @@ -43,12 +43,10 @@ }; #ifdef NEW_GC -DEFINE_LRECORD_IMPLEMENTATION ("tty-color-instance-data", - tty_color_instance_data, - 0, /*dumpable-flag*/ - 0, 0, 0, 0, 0, - tty_color_instance_data_description_1, - struct tty_color_instance_data); +DEFINE_DUMPABLE_INTERNAL_LISP_OBJECT ("tty-color-instance-data", + tty_color_instance_data, + 0, tty_color_instance_data_description_1, + struct tty_color_instance_data); #else /* not NEW_GC */ const struct sized_memory_description tty_color_instance_data_description = { sizeof (struct tty_color_instance_data), tty_color_instance_data_description_1 @@ -61,12 +59,10 @@ }; #ifdef NEW_GC -DEFINE_LRECORD_IMPLEMENTATION ("tty-font-instance-data", - tty_font_instance_data, - 0, /*dumpable-flag*/ - 0, 0, 0, 0, 0, - tty_font_instance_data_description_1, - struct tty_font_instance_data); +DEFINE_DUMPABLE_INTERNAL_LISP_OBJECT ("tty-font-instance-data", + tty_font_instance_data, 0, + tty_font_instance_data_description_1, + struct tty_font_instance_data); #else /* not NEW_GC */ const struct sized_memory_description tty_font_instance_data_description = { sizeof (struct tty_font_instance_data), tty_font_instance_data_description_1 @@ -195,8 +191,8 @@ /* Don't allocate the data until we're sure that we will succeed. */ #ifdef NEW_GC - c->data = alloc_lrecord_type (struct tty_color_instance_data, - &lrecord_tty_color_instance_data); + c->data = + XTTY_COLOR_INSTANCE_DATA (ALLOC_NORMAL_LISP_OBJECT (tty_color_instance_data)); #else /* not NEW_GC */ c->data = xnew (struct tty_color_instance_data); #endif /* not NEW_GC */ @@ -280,8 +276,8 @@ /* Don't allocate the data until we're sure that we will succeed. */ #ifdef NEW_GC - f->data = alloc_lrecord_type (struct tty_font_instance_data, - &lrecord_tty_font_instance_data); + f->data = + XTTY_FONT_INSTANCE_DATA (ALLOC_NORMAL_LISP_OBJECT (tty_font_instance_data)); #else /* not NEW_GC */ f->data = xnew (struct tty_font_instance_data); #endif /* not NEW_GC */ @@ -397,8 +393,8 @@ syms_of_objects_tty (void) { #ifdef NEW_GC - INIT_LRECORD_IMPLEMENTATION (tty_color_instance_data); - INIT_LRECORD_IMPLEMENTATION (tty_font_instance_data); + INIT_LISP_OBJECT (tty_color_instance_data); + INIT_LISP_OBJECT (tty_font_instance_data); #endif /* NEW_GC */ DEFSUBR (Fregister_tty_color);