*** empty log message ***

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

diff --git a/libguile/init.c b/libguile/init.c
index dacd1ee..9aefedc 100644 (file)
--- a/libguile/init.c
+++ b/libguile/init.c
@@ -132,7 +132,6 @@
 #include "libguile/strports.h"
 #include "libguile/struct.h"
 #include "libguile/symbols.h"
-#include "libguile/tag.h"
 #include "libguile/throw.h"
 #include "libguile/unif.h"
 #include "libguile/values.h"
@@ -142,6 +141,7 @@
 #include "libguile/vports.h"
 #include "libguile/weaks.h"
 #include "libguile/guardians.h"
+#include "libguile/extensions.h"
 
 #include "libguile/init.h"
 
@@ -188,7 +188,7 @@ start_stack (void *base)
   /* Create an object to hold the root continuation.
    */
   {
-    scm_contregs *contregs = scm_must_malloc (sizeof (scm_contregs),
+    scm_t_contregs *contregs = scm_must_malloc (sizeof (scm_t_contregs),
                                              "continuation");
     contregs->num_stack_items = 0;
     contregs->seq = 0;
@@ -228,7 +228,7 @@ fixconfig (char *s1,char *s2,int s)
 static void
 check_config (void)
 {
-  scm_sizet j;
+  size_t j;
 
   j = HEAP_SEG_SIZE;
   if (HEAP_SEG_SIZE != j)
@@ -278,7 +278,9 @@ stream_body (void *data)
 
 /* exception handler for stream_body.  */
 static SCM
-stream_handler (void *data, SCM tag, SCM throw_args)
+stream_handler (void *data SCM_UNUSED,
+               SCM tag SCM_UNUSED,
+               SCM throw_args SCM_UNUSED)
 {
   return SCM_BOOL_F;
 }
@@ -366,8 +368,6 @@ scm_load_startup_files ()
       /* Load the init.scm file.  */
       if (SCM_NFALSEP (init_path))
        scm_primitive_load (init_path);
-  
-      scm_post_boot_init_modules ();
     }
 }
 
@@ -477,6 +477,8 @@ scm_init_guile_1 (SCM_STACKITEM *base)
   scm_weaks_prehistory ();       /* requires storage */
   scm_init_subr_table ();
   scm_environments_prehistory (); /* requires storage */
+  scm_modules_prehistory ();      /* requires storage */
+  scm_init_variable ();           /* all bindings need variables */
   scm_init_continuations ();
   scm_init_root ();              /* requires continuations */
 #ifdef USE_THREADS
@@ -545,7 +547,6 @@ scm_init_guile_1 (SCM_STACKITEM *base)
   scm_init_struct ();   /* Requires strings */
   scm_init_stacks ();   /* Requires strings, struct */
   scm_init_symbols ();
-  scm_init_tag ();
   scm_init_values ();   /* Requires struct */
   scm_init_load ();     /* Requires strings */
   scm_init_objects (); /* Requires struct */
@@ -555,7 +556,6 @@ scm_init_guile_1 (SCM_STACKITEM *base)
   scm_init_strorder ();
   scm_init_strop ();
   scm_init_throw ();
-  scm_init_variable ();
   scm_init_vectors ();
   scm_init_version ();
   scm_init_weaks ();
@@ -578,7 +578,7 @@ scm_init_guile_1 (SCM_STACKITEM *base)
   scm_init_lang ();
   scm_init_script ();
 
-  scm_init_oop_goops_goopscore_module ();
+  scm_init_goops ();
   
   scm_initialized_p = 1;
 
@@ -589,13 +589,11 @@ scm_init_guile_1 (SCM_STACKITEM *base)
   scm_stack_checking_enabled_p = SCM_STACK_CHECKING_P;
 #endif
 
-  scm_load_startup_files ();
-
-  /* these are located here, not from a deep understanding of the
-     module system, but as a way of avoiding segv and other
-     undesirable side effects that arise from various alternatives.  */
   scm_init_rdelim ();
   scm_init_rw ();
+  scm_init_extensions ();
+
+  scm_load_startup_files ();
 }
 
 /* Record here whether SCM_BOOT_GUILE_1 has already been called.  This