diff options
author | Ludovic Courtès <ludo@gnu.org> | 2008-09-10 22:27:30 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2008-09-10 22:27:30 +0200 |
commit | 35a9197ccc91a3663313e1bf7d369101754a1075 (patch) | |
tree | 0389f04f4267d26b70c8e8cd54329be28ccf438b /libguile/init.c | |
parent | e7bca22779c68b800c75fdad8841440dfeb32f8d (diff) | |
parent | f30e1bdf97ae8b2b2918da585f887a4d3a23a347 (diff) | |
download | guile-35a9197ccc91a3663313e1bf7d369101754a1075.tar.gz |
Merge commit 'f30e1bdf97ae8b2b2918da585f887a4d3a23a347' into boehm-demers-weiser-gc
Conflicts:
libguile/Makefile.am
libguile/coop-pthreads.c
libguile/gc-freelist.c
libguile/gc-segment.c
libguile/gc.c
libguile/private-gc.h
test-suite/tests/environments.nottest
Diffstat (limited to 'libguile/init.c')
-rw-r--r-- | libguile/init.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libguile/init.c b/libguile/init.c index 46919f0fe..664aee63a 100644 --- a/libguile/init.c +++ b/libguile/init.c @@ -46,7 +46,9 @@ #include "libguile/deprecation.h" #include "libguile/dynl.h" #include "libguile/dynwind.h" +#if 0 #include "libguile/environments.h" +#endif #include "libguile/eq.h" #include "libguile/error.h" #include "libguile/eval.h" @@ -63,7 +65,7 @@ #include "libguile/hash.h" #include "libguile/hashtab.h" #include "libguile/hooks.h" -#include "libguile/i18n.h" +#include "libguile/gettext.h" #include "libguile/iselect.h" #include "libguile/ioext.h" #include "libguile/keywords.h" @@ -436,7 +438,9 @@ scm_i_init_guile (SCM_STACKITEM *base) scm_struct_prehistory (); /* requires storage */ scm_symbols_prehistory (); /* requires storage */ scm_init_subr_table (); +#if 0 scm_environments_prehistory (); /* requires storage */ +#endif scm_modules_prehistory (); /* requires storage and hash tables */ scm_init_variable (); /* all bindings need variables */ scm_init_continuations (); @@ -445,7 +449,9 @@ scm_i_init_guile (SCM_STACKITEM *base) scm_init_gsubr (); scm_init_thread_procs (); /* requires gsubrs */ scm_init_procprop (); +#if 0 scm_init_environments (); +#endif scm_init_alist (); scm_init_arbiters (); scm_init_async (); @@ -475,7 +481,7 @@ scm_i_init_guile (SCM_STACKITEM *base) scm_init_properties (); scm_init_hooks (); /* Requires smob_prehistory */ scm_init_gc (); /* Requires hooks, async */ - scm_init_i18n (); + scm_init_gettext (); scm_init_ioext (); scm_init_keywords (); scm_init_list (); |