Reverted changed from 2005/01/24 19:14:54, which was a commit to the

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

diff --git a/libguile/init.c b/libguile/init.c
index 9e09e25..ca964af 100644 (file)
--- a/libguile/init.c
+++ b/libguile/init.c
@@ -63,6 +63,7 @@
 #include "libguile/hash.h"
 #include "libguile/hashtab.h"
 #include "libguile/hooks.h"
+#include "libguile/i18n.h"
 #include "libguile/iselect.h"
 #include "libguile/ioext.h"
 #include "libguile/keywords.h"
@@ -103,7 +104,8 @@
 #include "libguile/stacks.h"
 #include "libguile/stime.h"
 #include "libguile/strings.h"
-#include "libguile/strop.h"
+#include "libguile/srfi-13.h"
+#include "libguile/srfi-14.h"
 #include "libguile/strorder.h"
 #include "libguile/strports.h"
 #include "libguile/struct.h"
@@ -118,6 +120,7 @@
 #include "libguile/weaks.h"
 #include "libguile/guardians.h"
 #include "libguile/extensions.h"
+#include "libguile/srfi-4.h"
 #include "libguile/discouraged.h"
 #include "libguile/deprecated.h"
 
@@ -224,7 +227,7 @@ stream_body (void *data)
 {
   stream_body_data *body_data = (stream_body_data *) data;
   SCM port = scm_fdes_to_port (body_data->fdes, body_data->mode,
-                              scm_makfrom0str (body_data->name));
+                              scm_from_locale_string (body_data->name));
 
   SCM_REVEALED (port) = 1;
   return port;
@@ -309,12 +312,13 @@ scm_load_startup_files ()
   /* We want a path only containing directories from GUILE_LOAD_PATH,
      SCM_SITE_DIR and SCM_LIBRARY_DIR when searching for the site init
      file, so we do this before loading Ice-9.  */
-  SCM init_path = scm_sys_search_load_path (scm_makfrom0str ("init.scm"));
+  SCM init_path =
+    scm_sys_search_load_path (scm_from_locale_string ("init.scm"));
 
   /* Load Ice-9.  */
   if (!scm_ice_9_already_loaded)
     {
-      scm_primitive_load_path (scm_makfrom0str ("ice-9/boot-9.scm"));
+      scm_primitive_load_path (scm_from_locale_string ("ice-9/boot-9.scm"));
 
       /* Load the init.scm file.  */
       if (scm_is_true (init_path))
@@ -475,6 +479,7 @@ scm_init_guile_1 (SCM_STACKITEM *base)
   scm_init_properties ();
   scm_init_hooks ();            /* Requires smob_prehistory */
   scm_init_gc ();              /* Requires hooks, async */
+  scm_init_i18n ();
   scm_init_ioext ();
   scm_init_keywords ();
   scm_init_list ();
@@ -512,7 +517,8 @@ scm_init_guile_1 (SCM_STACKITEM *base)
   scm_init_read ();
   scm_init_stime ();
   scm_init_strorder ();
-  scm_init_strop ();
+  scm_init_srfi_13 ();
+  scm_init_srfi_14 ();
   scm_init_throw ();
   scm_init_vectors ();
   scm_init_version ();
@@ -523,10 +529,8 @@ scm_init_guile_1 (SCM_STACKITEM *base)
   scm_init_evalext ();
   scm_init_debug ();   /* Requires macro smobs */
   scm_init_random ();
-#if SCM_HAVE_ARRAYS
   scm_init_ramap ();
   scm_init_unif ();
-#endif
   scm_init_simpos ();
   scm_init_load_path ();
   scm_init_standard_ports ();  /* Requires fports */
@@ -535,6 +539,7 @@ scm_init_guile_1 (SCM_STACKITEM *base)
   scm_init_lang ();
 #endif /* SCM_ENABLE_ELISP */
   scm_init_script ();
+  scm_init_srfi_4 ();
 
   scm_init_goops ();