Mercurial > hg > xemacs-beta

comparison src/elhash.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 a9c41067dd88
children 71ee43b8a74d
comparison
equal deleted inserted replaced
5177:b785049378e3 5178:97eb4942aec8
23 #ifndef INCLUDED_elhash_h_ 23 #ifndef INCLUDED_elhash_h_
24 #define INCLUDED_elhash_h_ 24 #define INCLUDED_elhash_h_
25 25
26 typedef struct Lisp_Hash_Table Lisp_Hash_Table; 26 typedef struct Lisp_Hash_Table Lisp_Hash_Table;
27 27
28 DECLARE_LRECORD (hash_table, Lisp_Hash_Table); 28 DECLARE_LISP_OBJECT (hash_table, Lisp_Hash_Table);
29 29
30 #define XHASH_TABLE(x) XRECORD (x, hash_table, Lisp_Hash_Table) 30 #define XHASH_TABLE(x) XRECORD (x, hash_table, Lisp_Hash_Table)
31 #define wrap_hash_table(p) wrap_record (p, hash_table) 31 #define wrap_hash_table(p) wrap_record (p, hash_table)
32 #define HASH_TABLEP(x) RECORDP (x, hash_table) 32 #define HASH_TABLEP(x) RECORDP (x, hash_table)
33 #define CHECK_HASH_TABLE(x) CHECK_RECORD (x, hash_table) 33 #define CHECK_HASH_TABLE(x) CHECK_RECORD (x, hash_table)
34 #define CONCHECK_HASH_TABLE(x) CONCHECK_RECORD (x, hash_table) 34 #define CONCHECK_HASH_TABLE(x) CONCHECK_RECORD (x, hash_table)
35 35
36 typedef struct htentry 36 typedef struct htentry
37 { 37 {
38 #ifdef NEW_GC 38 #ifdef NEW_GC
39 struct lrecord_header lheader; 39 NORMAL_LISP_OBJECT_HEADER lheader;
40 #endif /* NEW_GC */ 40 #endif /* NEW_GC */
41 Lisp_Object key; 41 Lisp_Object key;
42 Lisp_Object value; 42 Lisp_Object value;
43 } htentry; 43 } htentry;
44 44
46 46
47 #ifdef NEW_GC 47 #ifdef NEW_GC
48 48
49 typedef struct htentry Lisp_Hash_Table_Entry; 49 typedef struct htentry Lisp_Hash_Table_Entry;
50 50
51 DECLARE_LRECORD (hash_table_entry, Lisp_Hash_Table_Entry); 51 DECLARE_LISP_OBJECT (hash_table_entry, Lisp_Hash_Table_Entry);
52 52
53 #define XHASH_TABLE_ENTRY(x) \ 53 #define XHASH_TABLE_ENTRY(x) \
54 XRECORD (x, hash_table_entry, Lisp_Hash_Table_Entry) 54 XRECORD (x, hash_table_entry, Lisp_Hash_Table_Entry)
55 #define wrap_hash_table_entry(p) wrap_record (p, hash_table_entry) 55 #define wrap_hash_table_entry(p) wrap_record (p, hash_table_entry)
56 #define HASH_TABLE_ENTRYP(x) RECORDP (x, hash_table_entry) 56 #define HASH_TABLE_ENTRYP(x) RECORDP (x, hash_table_entry)