diff src/objects-impl.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-impl.h	Fri Mar 12 20:23:50 2010 -0600
+++ b/src/objects-impl.h	Sat Mar 13 05:38:34 2010 -0600
@@ -125,7 +125,7 @@
 
 struct Lisp_Color_Instance
 {
-  struct LCRECORD_HEADER header;
+  NORMAL_LISP_OBJECT_HEADER header;
   Lisp_Object name;
   Lisp_Object device;
 
@@ -145,7 +145,7 @@
 
 struct Lisp_Font_Instance
 {
-  struct LCRECORD_HEADER header;
+  NORMAL_LISP_OBJECT_HEADER header;
   Lisp_Object name; /* the instantiator used to create the font instance */
   Lisp_Object truename; /* used by the device-specific methods; we need to
 			   call them to get the truename (#### in reality,