diff options
author | Andy Wingo <wingo@pobox.com> | 2012-03-08 13:22:09 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2012-03-08 13:22:09 +0100 |
commit | bc612809929b85fdcb39bc17a15a53c88b43a8bd (patch) | |
tree | 14444f0fb0f69cf9db6b7bf1493c780488c47093 /libguile/init.c | |
parent | c336514976ed3f2b2b20c56149ede7f5ec549c52 (diff) | |
parent | f740445a9b5bf0a5e5090f0a2ddaffb2b803bab7 (diff) | |
download | guile-bc612809929b85fdcb39bc17a15a53c88b43a8bd.tar.gz |
Merge remote-tracking branch 'local-2.0/stable-2.0'
Conflicts:
configure.ac
libguile/finalizers.c
libguile/finalizers.h
libguile/gc.c
libguile/gc.h
libguile/inline.c
libguile/inline.h
libguile/ports.c
libguile/smob.c
libguile/smob.h
module/ice-9/deprecated.scm
module/ice-9/r4rs.scm
Diffstat (limited to 'libguile/init.c')
-rw-r--r-- | libguile/init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libguile/init.c b/libguile/init.c index 90b01eedb..684f6eb02 100644 --- a/libguile/init.c +++ b/libguile/init.c @@ -444,7 +444,8 @@ scm_i_init_guile (void *base) scm_init_ioext (); scm_init_keywords (); /* Requires smob_prehistory */ scm_init_list (); - scm_init_macros (); /* Requires smob_prehistory */ + scm_init_random (); /* Requires smob_prehistory */ + scm_init_macros (); /* Requires smob_prehistory and random */ scm_init_mallocs (); /* Requires smob_prehistory */ scm_init_modules (); /* Requires smob_prehistory */ scm_init_numbers (); @@ -502,7 +503,6 @@ scm_i_init_guile (void *base) scm_init_eval_in_scheme (); scm_init_evalext (); scm_init_debug (); /* Requires macro smobs */ - scm_init_random (); /* Requires smob_prehistory */ scm_init_simpos (); #if HAVE_MODULES scm_init_dynamic_linking (); /* Requires smob_prehistory */ |