summaryrefslogtreecommitdiff
path: root/libguile/init.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2011-10-27 13:45:04 +0200
committerAndy Wingo <wingo@pobox.com>2011-10-27 13:45:04 +0200
commit4938d3cb742de2a356586c55e5af32e193c5990b (patch)
treeb4bfe0fd26e102c5fa38ca9965bc4ebdbae8e3b4 /libguile/init.c
parent9d013330154852bc2309947adaa30b32418642c0 (diff)
parent2be3feb17e5456bba71749e0e97adf45c32c4e0e (diff)
downloadguile-4938d3cb742de2a356586c55e5af32e193c5990b.tar.gz
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts: GUILE-VERSION libguile/deprecated.c libguile/gc-malloc.c module/language/tree-il/peval.scm
Diffstat (limited to 'libguile/init.c')
-rw-r--r--libguile/init.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libguile/init.c b/libguile/init.c
index 130725c8f..02dbb99ec 100644
--- a/libguile/init.c
+++ b/libguile/init.c
@@ -434,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 ();
@@ -480,7 +481,6 @@ 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 */