Mercurial > hg > xemacs-beta

comparison src/fontcolor-tty-impl.h @ 5178:97eb4942aec8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Ben Wing <ben@xemacs.org>
date Mon, 29 Mar 2010 21:28:13 -0500
parents src/objects-tty-impl.h@a9c41067dd88 src/objects-tty-impl.h@8b2f75cecb89
children 308d34e9f07d
comparison
equal deleted inserted replaced
5177:b785049378e3 5178:97eb4942aec8
28 #include "fontcolor-tty.h" 28 #include "fontcolor-tty.h"
29 29
30 struct tty_color_instance_data 30 struct tty_color_instance_data
31 { 31 {
32 #ifdef NEW_GC 32 #ifdef NEW_GC
33 struct lrecord_header header; 33 NORMAL_LISP_OBJECT_HEADER header;
34 #endif /* NEW_GC */ 34 #endif /* NEW_GC */
35 Lisp_Object symbol; /* so we don't have to constantly call Fintern() */ 35 Lisp_Object symbol; /* so we don't have to constantly call Fintern() */
36 }; 36 };
37 37
38 #ifdef NEW_GC 38 #ifdef NEW_GC
39 DECLARE_LRECORD (tty_color_instance_data, struct tty_color_instance_data); 39 DECLARE_LISP_OBJECT (tty_color_instance_data, struct tty_color_instance_data);
40 #define XTTY_COLOR_INSTANCE_DATA(x) \ 40 #define XTTY_COLOR_INSTANCE_DATA(x) \
41 XRECORD (x, tty_color_instance_data, struct tty_color_instance_data) 41 XRECORD (x, tty_color_instance_data, struct tty_color_instance_data)
42 #define wrap_tty_color_instance_data(p) \ 42 #define wrap_tty_color_instance_data(p) \
43 wrap_record (p, tty_color_instance_data) 43 wrap_record (p, tty_color_instance_data)
44 #define TTY_COLOR_INSTANCE_DATAP(x) RECORDP (x, tty_color_instance_data) 44 #define TTY_COLOR_INSTANCE_DATAP(x) RECORDP (x, tty_color_instance_data)
54 #define COLOR_INSTANCE_TTY_SYMBOL(c) (TTY_COLOR_INSTANCE_DATA (c)->symbol) 54 #define COLOR_INSTANCE_TTY_SYMBOL(c) (TTY_COLOR_INSTANCE_DATA (c)->symbol)
55 55
56 struct tty_font_instance_data 56 struct tty_font_instance_data
57 { 57 {
58 #ifdef NEW_GC 58 #ifdef NEW_GC
59 struct lrecord_header header; 59 NORMAL_LISP_OBJECT_HEADER header;
60 #endif /* NEW_GC */ 60 #endif /* NEW_GC */
61 Lisp_Object charset; 61 Lisp_Object charset;
62 }; 62 };
63 63
64 #ifdef NEW_GC 64 #ifdef NEW_GC
65 DECLARE_LRECORD (tty_font_instance_data, struct tty_font_instance_data); 65 DECLARE_LISP_OBJECT (tty_font_instance_data, struct tty_font_instance_data);
66 #define XTTY_FONT_INSTANCE_DATA(x) \ 66 #define XTTY_FONT_INSTANCE_DATA(x) \
67 XRECORD (x, tty_font_instance_data, struct tty_font_instance_data) 67 XRECORD (x, tty_font_instance_data, struct tty_font_instance_data)
68 #define wrap_tty_font_instance_data(p) \ 68 #define wrap_tty_font_instance_data(p) \
69 wrap_record (p, tty_font_instance_data) 69 wrap_record (p, tty_font_instance_data)
70 #define TTY_FONT_INSTANCE_DATAP(x) RECORDP (x, tty_font_instance_data) 70 #define TTY_FONT_INSTANCE_DATAP(x) RECORDP (x, tty_font_instance_data)