Bad change to glyphs.c
This patch committed to 21.2 since b16 causes a non-X11 build to
puke. Olivier?
gcc -c -O -Demacs -I. -DHAVE_CONFIG_H -I/usr/local/canna/include glyphs.c
glyphs.c:2930: parse error before `struct'
glyphs.c:2930: `image' undeclared here (not in a function)
glyphs.c:2930: initializer element for `glyph_description[0].offset' is not constant
make[1]: *** [glyphs.o] Error 1
make[1]: Leaving directory `/project/xemacs/home/steve/devel/xemacs-21.2/src'
make: *** [src] Error 2
Index: src/glyphs.c
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs/src/glyphs.c,v
retrieving revision 1.23.2.12
retrieving revision 1.23.2.14
diff -u -r1.23.2.12 -r1.23.2.14
--- glyphs.c 1999/06/13 21:45:14 1.23.2.12
+++ glyphs.c 1999/06/23 19:52:45 1.23.2.14
＠＠ -911,7 +911,7 ＠＠
DEFINE_LRECORD_IMPLEMENTATION ("image-instance", image_instance,
mark_image_instance, print_image_instance,
finalize_image_instance, image_instance_equal,
- image_instance_hash,
+ image_instance_hash, 0,
struct Lisp_Image_Instance);
static Lisp_Object
＠＠ -2926,9 +2926,14 ＠＠
return result;
}
+static const struct lrecord_description glyph_description[] = {
+ { XD_LISP_OBJECT, offsetof(struct Lisp_Glyph, image), 5 },
+ { XD_END }
+};
+
DEFINE_LRECORD_IMPLEMENTATION_WITH_PROPS ("glyph", glyph,
mark_glyph, print_glyph, 0,
- glyph_equal, glyph_hash,
+ glyph_equal, glyph_hash, glyph_description,
glyph_getprop, glyph_putprop,
glyph_remprop, glyph_plist,
struct Lisp_Glyph);
--
泣き面に蜂