summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libguile/ChangeLog7
-rw-r--r--libguile/gc.c22
-rw-r--r--libguile/root.h19
3 files changed, 16 insertions, 32 deletions
diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 6b19a9079..649fe9c4f 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,10 @@
+2000-06-28 Dirk Herrmann <D.Herrmann@tu-bs.de>
+
+ * gc.c (scm_igc): Removed commented code that once was intended
+ to unprotect struct types with no instances.
+
+ * root.h (scm_type_obj_list): Removed.
+
2000-06-27 Dirk Herrmann <D.Herrmann@tu-bs.de>
* async.c (scm_init_async): Switch to standard way of smob
diff --git a/libguile/gc.c b/libguile/gc.c
index d2e13d88e..c8aec31a9 100644
--- a/libguile/gc.c
+++ b/libguile/gc.c
@@ -796,28 +796,6 @@ scm_igc (const char *what)
++scm_gc_heap_lock;
- /* unprotect any struct types with no instances */
-#if 0
- {
- SCM type_list;
- SCM * pos;
-
- pos = &scm_type_obj_list;
- type_list = scm_type_obj_list;
- while (type_list != SCM_EOL)
- if (SCM_VELTS (SCM_CAR (type_list))[scm_struct_i_refcnt])
- {
- pos = SCM_CDRLOC (type_list);
- type_list = SCM_CDR (type_list);
- }
- else
- {
- *pos = SCM_CDR (type_list);
- type_list = SCM_CDR (type_list);
- }
- }
-#endif
-
/* flush dead entries from the continuation stack */
{
int x;
diff --git a/libguile/root.h b/libguile/root.h
index 5ed36ec83..58466b29a 100644
--- a/libguile/root.h
+++ b/libguile/root.h
@@ -65,18 +65,17 @@
#define scm_weak_symhash scm_sys_protects[6]
#define scm_symhash_vars scm_sys_protects[7]
#define scm_keyword_obarray scm_sys_protects[8]
-#define scm_type_obj_list scm_sys_protects[9]
-#define scm_first_type scm_sys_protects[10]
-#define scm_stand_in_procs scm_sys_protects[11]
-#define scm_object_whash scm_sys_protects[12]
-#define scm_permobjs scm_sys_protects[13]
-#define scm_asyncs scm_sys_protects[14]
-#define scm_protects scm_sys_protects[15]
+#define scm_first_type scm_sys_protects[9]
+#define scm_stand_in_procs scm_sys_protects[10]
+#define scm_object_whash scm_sys_protects[11]
+#define scm_permobjs scm_sys_protects[12]
+#define scm_asyncs scm_sys_protects[13]
+#define scm_protects scm_sys_protects[14]
#ifdef DEBUG_EXTENSIONS
-#define scm_source_whash scm_sys_protects[16]
-#define SCM_NUM_PROTECTS 17
-#else
+#define scm_source_whash scm_sys_protects[15]
#define SCM_NUM_PROTECTS 16
+#else
+#define SCM_NUM_PROTECTS 15
#endif
extern SCM scm_sys_protects[];