threadsafe port revealed counts

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

diff --git a/libguile/init.c b/libguile/init.c
index a541eeb..02dbb99 100644 (file)
--- a/libguile/init.c
+++ b/libguile/init.c
@@ -133,7 +133,6 @@
 #include "libguile/version.h"
 #include "libguile/vm.h"
 #include "libguile/vports.h"
-#include "libguile/weaks.h"
 #include "libguile/guardians.h"
 #include "libguile/extensions.h"
 #include "libguile/uniform.h"
@@ -383,11 +382,11 @@ scm_i_init_guile (void *base)
 
   scm_storage_prehistory ();
   scm_threads_prehistory (base);  /* requires storage_prehistory */
-  scm_weaks_prehistory ();        /* requires storage_prehistory */
+  scm_weak_table_prehistory ();        /* requires storage_prehistory */
 #ifdef GUILE_DEBUG_MALLOC
   scm_debug_malloc_prehistory ();
 #endif
-  scm_symbols_prehistory ();      /* requires weaks_prehistory */
+  scm_symbols_prehistory ();      /* requires weak_table_prehistory */
   scm_modules_prehistory ();
   scm_init_array_handle ();
   scm_bootstrap_bytevectors ();   /* Requires array-handle */
@@ -435,7 +434,8 @@ scm_i_init_guile (void *base)
   scm_init_objprop ();
   scm_init_promises ();         /* requires smob_prehistory */
   scm_init_hooks ();            /* Requires smob_prehistory */
-  scm_init_gc ();              /* Requires hooks */
+  scm_init_stime ();
+  scm_init_gc ();              /* Requires hooks and `get_internal_run_time' */
   scm_init_gc_protect_object ();  /* requires threads_prehistory */
   scm_init_gdbint ();           /* Requires strports, gc_protect_object */
   scm_init_gettext ();
@@ -481,14 +481,15 @@ scm_i_init_guile (void *base)
   scm_init_load ();     /* Requires strings */
   scm_init_print ();   /* Requires strings, struct, smob */
   scm_init_read ();
-  scm_init_stime ();
   scm_init_strorder ();
   scm_init_srfi_13 ();
   scm_init_srfi_14 ();  /* Requires smob_prehistory */
   scm_init_throw ();    /* Requires smob_prehistory */
   scm_init_trees ();
   scm_init_version ();
-  scm_init_weaks ();
+  scm_init_weak_set ();
+  scm_init_weak_table ();
+  scm_init_weak_vectors ();
   scm_init_guardians (); /* requires smob_prehistory */
   scm_init_vports ();
   scm_init_standard_ports ();  /* Requires fports */
@@ -501,7 +502,9 @@ scm_i_init_guile (void *base)
   scm_init_debug ();   /* Requires macro smobs */
   scm_init_random ();   /* Requires smob_prehistory */
   scm_init_simpos ();
+#if HAVE_MODULES
   scm_init_dynamic_linking (); /* Requires smob_prehistory */
+#endif
   scm_bootstrap_i18n ();
   scm_init_script ();