comparison src/objects-tty-impl.h @ 3092:141c2920ea48

[xemacs-hg @ 2005-11-25 01:41:31 by crestani] Incremental Garbage Collector
author crestani
date Fri, 25 Nov 2005 01:42:08 +0000
parents 79c6ff3eef26
children e0db3c197671
comparison
equal deleted inserted replaced
3091:c22d8984148c 3092:141c2920ea48
27 #include "objects-impl.h" 27 #include "objects-impl.h"
28 #include "objects-tty.h" 28 #include "objects-tty.h"
29 29
30 struct tty_color_instance_data 30 struct tty_color_instance_data
31 { 31 {
32 #ifdef NEW_GC
33 struct lrecord_header header;
34 #endif /* NEW_GC */
32 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() */
33 }; 36 };
37
38 #ifdef NEW_GC
39 DECLARE_LRECORD (tty_color_instance_data, struct tty_color_instance_data);
40 #define XTTY_COLOR_INSTANCE_DATA(x) \
41 XRECORD (x, tty_color_instance_data, struct tty_color_instance_data)
42 #define wrap_tty_color_instance_data(p) \
43 wrap_record (p, tty_color_instance_data)
44 #define TTY_COLOR_INSTANCE_DATAP(x) RECORDP (x, tty_color_instance_data)
45 #define CHECK_TTY_COLOR_INSTANCE_DATA(x) \
46 CHECK_RECORD (x, tty_color_instance_data)
47 #define CONCHECK_TTY_COLOR_INSTANCE_DATA(x) \
48 CONCHECK_RECORD (x, tty_color_instance_data)
49 #endif /* NEW_GC */
34 50
35 #define TTY_COLOR_INSTANCE_DATA(c) \ 51 #define TTY_COLOR_INSTANCE_DATA(c) \
36 ((struct tty_color_instance_data *) (c)->data) 52 ((struct tty_color_instance_data *) (c)->data)
37 53
38 #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)
39 55
40 struct tty_font_instance_data 56 struct tty_font_instance_data
41 { 57 {
58 #ifdef NEW_GC
59 struct lrecord_header header;
60 #endif /* NEW_GC */
42 Lisp_Object charset; 61 Lisp_Object charset;
43 }; 62 };
63
64 #ifdef NEW_GC
65 DECLARE_LRECORD (tty_font_instance_data, struct tty_font_instance_data);
66 #define XTTY_FONT_INSTANCE_DATA(x) \
67 XRECORD (x, tty_font_instance_data, struct tty_font_instance_data)
68 #define wrap_tty_font_instance_data(p) \
69 wrap_record (p, tty_font_instance_data)
70 #define TTY_FONT_INSTANCE_DATAP(x) RECORDP (x, tty_font_instance_data)
71 #define CHECK_TTY_FONT_INSTANCE_DATA(x) \
72 CHECK_RECORD (x, tty_font_instance_data)
73 #define CONCHECK_TTY_FONT_INSTANCE_DATA(x) \
74 CONCHECK_RECORD (x, tty_font_instance_data)
75 #endif /* NEW_GC */
44 76
45 #define TTY_FONT_INSTANCE_DATA(c) \ 77 #define TTY_FONT_INSTANCE_DATA(c) \
46 ((struct tty_font_instance_data *) (c)->data) 78 ((struct tty_font_instance_data *) (c)->data)
47 79
48 #define FONT_INSTANCE_TTY_CHARSET(c) (TTY_FONT_INSTANCE_DATA (c)->charset) 80 #define FONT_INSTANCE_TTY_CHARSET(c) (TTY_FONT_INSTANCE_DATA (c)->charset)