Mercurial > hg > xemacs-beta
diff src/objects-tty-impl.h @ 5140:e5380fdaf8f1
merge
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Sat, 13 Mar 2010 05:38:34 -0600 |
| parents | a9c41067dd88 |
| children |
line wrap: on
line diff
--- a/src/objects-tty-impl.h Fri Mar 12 20:23:50 2010 -0600 +++ b/src/objects-tty-impl.h Sat Mar 13 05:38:34 2010 -0600 @@ -30,13 +30,13 @@ struct tty_color_instance_data { #ifdef NEW_GC - struct lrecord_header header; + NORMAL_LISP_OBJECT_HEADER header; #endif /* NEW_GC */ Lisp_Object symbol; /* so we don't have to constantly call Fintern() */ }; #ifdef NEW_GC -DECLARE_LRECORD (tty_color_instance_data, struct tty_color_instance_data); +DECLARE_LISP_OBJECT (tty_color_instance_data, struct tty_color_instance_data); #define XTTY_COLOR_INSTANCE_DATA(x) \ XRECORD (x, tty_color_instance_data, struct tty_color_instance_data) #define wrap_tty_color_instance_data(p) \ @@ -56,13 +56,13 @@ struct tty_font_instance_data { #ifdef NEW_GC - struct lrecord_header header; + NORMAL_LISP_OBJECT_HEADER header; #endif /* NEW_GC */ Lisp_Object charset; }; #ifdef NEW_GC -DECLARE_LRECORD (tty_font_instance_data, struct tty_font_instance_data); +DECLARE_LISP_OBJECT (tty_font_instance_data, struct tty_font_instance_data); #define XTTY_FONT_INSTANCE_DATA(x) \ XRECORD (x, tty_font_instance_data, struct tty_font_instance_data) #define wrap_tty_font_instance_data(p) \
