Mercurial > hg > xemacs-beta
diff src/objects.h @ 5140:e5380fdaf8f1
merge
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Sat, 13 Mar 2010 05:38:34 -0600 |
| parents | 7be849cb8828 |
| children |
line wrap: on
line diff
--- a/src/objects.h Fri Mar 12 20:23:50 2010 -0600 +++ b/src/objects.h Sat Mar 13 05:38:34 2010 -0600 @@ -30,7 +30,7 @@ * Color Instance Object * ****************************************************************************/ -DECLARE_LRECORD (color_instance, Lisp_Color_Instance); +DECLARE_LISP_OBJECT (color_instance, Lisp_Color_Instance); #define XCOLOR_INSTANCE(x) XRECORD (x, color_instance, Lisp_Color_Instance) #define wrap_color_instance(p) wrap_record (p, color_instance) #define COLOR_INSTANCEP(x) RECORDP (x, color_instance) @@ -51,7 +51,7 @@ void initialize_charset_font_caches (struct device *d); void invalidate_charset_font_caches (Lisp_Object charset); -DECLARE_LRECORD (font_instance, Lisp_Font_Instance); +DECLARE_LISP_OBJECT (font_instance, Lisp_Font_Instance); #define XFONT_INSTANCE(x) XRECORD (x, font_instance, Lisp_Font_Instance) #define wrap_font_instance(p) wrap_record (p, font_instance) #define FONT_INSTANCEP(x) RECORDP (x, font_instance)