comparison src/chartab.h @ 5118:e0db3c197671 ben-lisp-object

merge up to latest default branch, doesn't compile yet
author Ben Wing <ben@xemacs.org>
date Sat, 26 Dec 2009 21:18:49 -0600
parents 1e7cc382eb16
children d1247f3cc363
comparison
equal deleted inserted replaced
5117:3742ea8250b5 5118:e0db3c197671
49 variable-size and add an offset value into this structure. */ 49 variable-size and add an offset value into this structure. */
50 Lisp_Object level2[96]; 50 Lisp_Object level2[96];
51 }; 51 };
52 typedef struct Lisp_Char_Table_Entry Lisp_Char_Table_Entry; 52 typedef struct Lisp_Char_Table_Entry Lisp_Char_Table_Entry;
53 53
54 DECLARE_LRECORD (char_table_entry, Lisp_Char_Table_Entry); 54 DECLARE_LISP_OBJECT (char_table_entry, Lisp_Char_Table_Entry);
55 #define XCHAR_TABLE_ENTRY(x) \ 55 #define XCHAR_TABLE_ENTRY(x) \
56 XRECORD (x, char_table_entry, Lisp_Char_Table_Entry) 56 XRECORD (x, char_table_entry, Lisp_Char_Table_Entry)
57 #define wrap_char_table_entry(p) wrap_record (p, char_table_entry) 57 #define wrap_char_table_entry(p) wrap_record (p, char_table_entry)
58 #define CHAR_TABLE_ENTRYP(x) RECORDP (x, char_table_entry) 58 #define CHAR_TABLE_ENTRYP(x) RECORDP (x, char_table_entry)
59 /* #define CHECK_CHAR_TABLE_ENTRY(x) CHECK_RECORD (x, char_table_entry) 59 /* #define CHECK_CHAR_TABLE_ENTRY(x) CHECK_RECORD (x, char_table_entry)
126 char dirty; /* nonzero if mirror dirty and needs updating. */ 126 char dirty; /* nonzero if mirror dirty and needs updating. */
127 char mirror_table_p; /* nonzero if this is a mirror table. */ 127 char mirror_table_p; /* nonzero if this is a mirror table. */
128 }; 128 };
129 typedef struct Lisp_Char_Table Lisp_Char_Table; 129 typedef struct Lisp_Char_Table Lisp_Char_Table;
130 130
131 DECLARE_LRECORD (char_table, Lisp_Char_Table); 131 DECLARE_LISP_OBJECT (char_table, Lisp_Char_Table);
132 #define XCHAR_TABLE(x) XRECORD (x, char_table, Lisp_Char_Table) 132 #define XCHAR_TABLE(x) XRECORD (x, char_table, Lisp_Char_Table)
133 #define wrap_char_table(p) wrap_record (p, char_table) 133 #define wrap_char_table(p) wrap_record (p, char_table)
134 #define CHAR_TABLEP(x) RECORDP (x, char_table) 134 #define CHAR_TABLEP(x) RECORDP (x, char_table)
135 #define CHECK_CHAR_TABLE(x) CHECK_RECORD (x, char_table) 135 #define CHECK_CHAR_TABLE(x) CHECK_RECORD (x, char_table)
136 #define CONCHECK_CHAR_TABLE(x) CONCHECK_RECORD (x, char_table) 136 #define CONCHECK_CHAR_TABLE(x) CONCHECK_RECORD (x, char_table)