From b505860d297f9f352ac309295168ae6977f12e78 Mon Sep 17 00:00:00 2001 From: Mikael Djurfeldt Date: Fri, 23 Jul 1999 13:14:05 +0000 Subject: [PATCH] * init.c: Make sure that scm_post_boot_init_modules is called only once. (Important when using a dumped image.; Thanks to Bernard Urban.) --- libguile/init.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/libguile/init.c b/libguile/init.c index bcffce1a3..7d314e75e 100644 --- a/libguile/init.c +++ b/libguile/init.c @@ -320,11 +320,15 @@ scm_load_startup_files () /* 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_makfrom0str ("ice-9/boot-9.scm")); - /* Load the init.scm file. */ - if (SCM_NFALSEP (init_path)) - scm_primitive_load (init_path); + /* Load the init.scm file. */ + if (SCM_NFALSEP (init_path)) + scm_primitive_load (init_path); + + scm_post_boot_init_modules (); + } } @@ -563,8 +567,6 @@ invoke_main_func (body_data) scm_load_startup_files (); - scm_post_boot_init_modules (); - (*closure->main_func) (closure->closure, closure->argc, closure->argv); /* never reached */