Merge commit '7337d56d5714227865aeca2b40b6bd97cce296d2' into boehm-demers-weiser-gc

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

diff --git a/libguile/fluids.c b/libguile/fluids.c
index eded074..b5334db 100644 (file)
--- a/libguile/fluids.c
+++ b/libguile/fluids.c
@@ -133,6 +133,8 @@ scan_dynamic_states_and_fluids (void *dummy1 SCM_UNUSED,
                                void *dummy2 SCM_UNUSED,
                                void *dummy3 SCM_UNUSED)
 {
+  /* FIXME: What to do here? */
+#if 0
   SCM *statep, *fluidp;
 
   /* Scan all fluids and deallocate the unmarked ones.
@@ -172,19 +174,10 @@ scan_dynamic_states_and_fluids (void *dummy1 SCM_UNUSED,
        }
     }
 
+#endif
   return NULL;
 }
 
-static size_t
-fluid_free (SCM fluid)
-{
-  /* The real work is done in scan_dynamic_states_and_fluids.  We can
-     not touch allocated_fluids etc here since a smob free routine can
-     be run at any time, in any thread.
-  */
-  return 0;
-}
-
 static int
 fluid_print (SCM exp, SCM port, scm_print_state *pstate SCM_UNUSED)
 {
@@ -604,11 +597,9 @@ void
 scm_fluids_prehistory ()
 {
   tc16_fluid = scm_make_smob_type ("fluid", 0);
-  scm_set_smob_free (tc16_fluid, fluid_free);
   scm_set_smob_print (tc16_fluid, fluid_print);
 
   tc16_dynamic_state = scm_make_smob_type ("dynamic-state", 0);
-  scm_set_smob_mark (tc16_dynamic_state, scm_markcdr);
 
   scm_c_hook_add (&scm_after_sweep_c_hook, scan_dynamic_states_and_fluids,
                  0, 0);