* __scm.h (SCM_ALLOW_INTS_ONLY): Removed.

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

diff --git a/libguile/init.c b/libguile/init.c
index 80e36cb..076b05c 100644 (file)
--- a/libguile/init.c
+++ b/libguile/init.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2002 Free Software Foundation, Inc.
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -83,9 +83,7 @@
 #include "libguile/hash.h"
 #include "libguile/hashtab.h"
 #include "libguile/hooks.h"
-#ifdef GUILE_ISELECT
 #include "libguile/iselect.h"
-#endif
 #include "libguile/ioext.h"
 #include "libguile/keywords.h"
 #include "libguile/lang.h"
@@ -446,14 +444,15 @@ scm_init_guile_1 (SCM_STACKITEM *base)
 
   scm_ints_disabled = 1;
   scm_block_gc = 1;
-  
+
+  scm_threads_prehistory ();
   scm_ports_prehistory ();
   scm_smob_prehistory ();
   scm_tables_prehistory ();
 #ifdef GUILE_DEBUG_MALLOC
   scm_debug_malloc_prehistory ();
 #endif
-  if (scm_init_storage ())               /* requires smob_prehistory */
+  if (scm_init_storage ())        /* requires threads and smob_prehistory */
     abort ();
   
   scm_struct_prehistory ();      /* requires storage */
@@ -465,11 +464,10 @@ scm_init_guile_1 (SCM_STACKITEM *base)
   scm_init_variable ();           /* all bindings need variables */
   scm_init_continuations ();
   scm_init_root ();              /* requires continuations */
-#ifdef USE_THREADS
   scm_init_threads (base);
-#endif
   start_stack (base);
   scm_init_gsubr ();
+  scm_init_thread_procs ();       /* requires gsubrs */
   scm_init_procprop ();
   scm_init_environments ();
   scm_init_feature ();
@@ -496,9 +494,6 @@ scm_init_guile_1 (SCM_STACKITEM *base)
   scm_init_properties ();
   scm_init_hooks ();            /* Requires smob_prehistory */
   scm_init_gc ();              /* Requires hooks, async */
-#ifdef GUILE_ISELECT
-  scm_init_iselect ();
-#endif
   scm_init_ioext ();
   scm_init_keywords ();
   scm_init_list ();