Merge remote-tracking branch 'origin/stable-2.0'

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

diff --git a/libguile/gc.c b/libguile/gc.c
index 0ab27a5..0d271af 100644 (file)
--- a/libguile/gc.c
+++ b/libguile/gc.c
@@ -46,7 +46,6 @@ extern unsigned long * __libc_ia64_register_backing_store_base;
 #include "libguile/root.h"
 #include "libguile/strings.h"
 #include "libguile/vectors.h"
-#include "libguile/weaks.h"
 #include "libguile/hashtab.h"
 #include "libguile/tags.h"
 
@@ -83,14 +82,10 @@ int scm_expensive_debug_cell_accesses_p = 0;
  */
 int scm_debug_cells_gc_interval = 0;
 
-#if SCM_ENABLE_DEPRECATED == 1
 /* Hash table that keeps a reference to objects the user wants to protect from
-   garbage collection.  It could arguably be private but applications have come
-   to rely on it (e.g., Lilypond 2.13.9).  */
-SCM scm_protects;
-#else
+   garbage collection.  */
 static SCM scm_protects;
-#endif
+
 
 #if (SCM_DEBUG_CELL_ACCESSES == 1)
 
@@ -952,6 +947,10 @@ scm_i_tag_name (scm_t_bits tag)
       return "foreign";
     case scm_tc7_hashtable:
       return "hashtable";
+    case scm_tc7_weak_set:
+      return "weak-set";
+    case scm_tc7_weak_table:
+      return "weak-table";
     case scm_tc7_fluid:
       return "fluid";
     case scm_tc7_dynamic_state: