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

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

diff --git a/libguile/gc.h b/libguile/gc.h
index db55abc..4692a49 100644 (file)
--- a/libguile/gc.h
+++ b/libguile/gc.h
@@ -136,7 +136,7 @@ void scm_i_expensive_validation_check (SCM cell);
 
 SCM_INTERNAL scm_i_pthread_mutex_t scm_i_gc_admin_mutex;
 
-#define scm_gc_running_p (SCM_I_CURRENT_THREAD->gc_running_p)
+#define scm_gc_running_p  0
 SCM_INTERNAL scm_i_pthread_mutex_t scm_i_sweep_mutex;
 
 #ifdef __ia64__
@@ -165,8 +165,6 @@ SCM_API size_t scm_max_segment_size;
 
 #define SCM_SET_FREELIST_LOC(key,ptr) scm_i_pthread_setspecific ((key), (ptr))
 #define SCM_FREELIST_LOC(key) ((SCM *) scm_i_pthread_getspecific (key))
-SCM_API scm_i_pthread_key_t scm_i_freelist;
-SCM_API scm_i_pthread_key_t scm_i_freelist2;
 SCM_API struct scm_t_cell_type_statistics scm_i_master_freelist;
 SCM_API struct scm_t_cell_type_statistics scm_i_master_freelist2;
 
@@ -206,6 +204,7 @@ SCM_API SCM scm_set_debug_cell_accesses_x (SCM flag);
 SCM_API SCM scm_object_address (SCM obj);
 SCM_API SCM scm_gc_enable (void);
 SCM_API SCM scm_gc_disable (void);
+SCM_API SCM scm_gc_dump (void);
 SCM_API SCM scm_gc_stats (void);
 SCM_API SCM scm_gc_live_object_stats (void);
 SCM_API SCM scm_gc (void);