diff options
Diffstat (limited to 'libguile/hashtab.h')
-rw-r--r-- | libguile/hashtab.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libguile/hashtab.h b/libguile/hashtab.h index 3afc6b29f..2e2c1a4d0 100644 --- a/libguile/hashtab.h +++ b/libguile/hashtab.h @@ -33,15 +33,15 @@ extern scm_t_bits scm_tc16_hashtable; -#define SCM_HASHTABLE_P(x) SCM_TYP16_PREDICATE (scm_tc16_hashtable, x) +#define SCM_HASHTABLE_P(x) SCM_SMOB_PREDICATE (scm_tc16_hashtable, x) #define SCM_VALIDATE_HASHTABLE(pos, arg) \ SCM_MAKE_VALIDATE_MSG (pos, arg, HASHTABLE_P, "hash-table") -#define SCM_HASHTABLE_VECTOR(h) SCM_CELL_OBJECT_1 (h) -#define SCM_SET_HASHTABLE_VECTOR(x, v) SCM_SET_CELL_OBJECT_1 (x, v) -#define SCM_HASHTABLE(x) ((scm_t_hashtable *) SCM_CELL_WORD_2 (x)) -#define SCM_HASHTABLE_NEXT(x) SCM_CELL_OBJECT_3 (x) -#define SCM_HASHTABLE_NEXTLOC(x) ((SCM *) SCM_CELL_WORD_LOC (x, 3)) -#define SCM_SET_HASHTABLE_NEXT(x, n) SCM_SET_CELL_OBJECT_3 (x, n) +#define SCM_HASHTABLE_VECTOR(h) SCM_SMOB_OBJECT (h) +#define SCM_SET_HASHTABLE_VECTOR(x, v) SCM_SET_SMOB_OBJECT ((x), (v)) +#define SCM_HASHTABLE(x) ((scm_t_hashtable *) SCM_SMOB_DATA_2 (x)) +#define SCM_HASHTABLE_NEXT(x) SCM_SMOB_OBJECT_3 (x) +#define SCM_HASHTABLE_NEXTLOC(x) SCM_SMOB_OBJECT_3_LOC (x) +#define SCM_SET_HASHTABLE_NEXT(x, n) SCM_SET_SMOB_OBJECT_3 ((x), (n)) #define SCM_HASHTABLE_FLAGS(x) (SCM_HASHTABLE (x)->flags) #define SCM_HASHTABLE_WEAK_KEY_P(x) \ (SCM_HASHTABLE_FLAGS (x) & SCM_HASHTABLEF_WEAK_CAR) |