comparison src/charset.h @ 5133:444a448b2f53

Merge branch ben-lisp-object into default branch
author Ben Wing <ben@xemacs.org>
date Sun, 07 Mar 2010 06:47:37 -0600
parents a9c41067dd88
children 70ed8a0d8da8
comparison
equal deleted inserted replaced
5113:b2dcf6a6d8ab 5133:444a448b2f53
183 /* Information about a particular character set */ 183 /* Information about a particular character set */
184 /************************************************************************/ 184 /************************************************************************/
185 185
186 struct Lisp_Charset 186 struct Lisp_Charset
187 { 187 {
188 struct LCRECORD_HEADER header; 188 NORMAL_LISP_OBJECT_HEADER header;
189 189
190 int id; 190 int id;
191 Lisp_Object name; 191 Lisp_Object name;
192 Lisp_Object doc_string; 192 Lisp_Object doc_string;
193 Lisp_Object registries; 193 Lisp_Object registries;
244 of this temporary charset. */ 244 of this temporary charset. */
245 unsigned int temporary :1; 245 unsigned int temporary :1;
246 }; 246 };
247 typedef struct Lisp_Charset Lisp_Charset; 247 typedef struct Lisp_Charset Lisp_Charset;
248 248
249 DECLARE_LRECORD (charset, Lisp_Charset); 249 DECLARE_LISP_OBJECT (charset, Lisp_Charset);
250 #define XCHARSET(x) XRECORD (x, charset, Lisp_Charset) 250 #define XCHARSET(x) XRECORD (x, charset, Lisp_Charset)
251 #define wrap_charset(p) wrap_record (p, charset) 251 #define wrap_charset(p) wrap_record (p, charset)
252 #define CHARSETP(x) RECORDP (x, charset) 252 #define CHARSETP(x) RECORDP (x, charset)
253 #define CHECK_CHARSET(x) CHECK_RECORD (x, charset) 253 #define CHECK_CHARSET(x) CHECK_RECORD (x, charset)
254 #define CONCHECK_CHARSET(x) CONCHECK_RECORD (x, charset) 254 #define CONCHECK_CHARSET(x) CONCHECK_RECORD (x, charset)