Merge branch 'master' into boehm-demers-weiser-gc

[bpt/guile.git] / libguile / hashtab.h

diff --git a/libguile/hashtab.h b/libguile/hashtab.h
index 4220b86..005fd57 100644 (file)
--- a/libguile/hashtab.h
+++ b/libguile/hashtab.h
@@ -39,9 +39,6 @@ SCM_API scm_t_bits scm_tc16_hashtable;
 #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)
@@ -98,7 +95,6 @@ SCM_API SCM scm_doubly_weak_hash_table_p (SCM h);
 
 SCM_INTERNAL void scm_i_rehash (SCM table, unsigned long (*hash_fn)(),
                                void *closure, const char *func_name);
-SCM_INTERNAL void scm_i_scan_weak_hashtables (void);
 
 SCM_API SCM scm_hash_fn_get_handle (SCM table, SCM obj, unsigned long (*hash_fn) (), SCM (*assoc_fn) (), void * closure);
 SCM_API SCM scm_hash_fn_create_handle_x (SCM table, SCM obj, SCM init, unsigned long (*hash_fn) (), SCM (*assoc_fn) (), void * closure);