From e2d085f3a22fa6d126afc5b04171ac04556e6d64 Mon Sep 17 00:00:00 2001 From: Marius Vollmer Date: Sat, 19 May 2001 00:29:36 +0000 Subject: [PATCH] (scm_init_guile_1): Call `scm_init_goops' instead of `scm_init_oop_goops_goopscore_module'. Call `scm_init_rdelim' and `scm_init_rw' prior to loading the startup files. --- libguile/init.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libguile/init.c b/libguile/init.c index 45ecb5f7a..0e91a7559 100644 --- a/libguile/init.c +++ b/libguile/init.c @@ -577,7 +577,7 @@ scm_init_guile_1 (SCM_STACKITEM *base) scm_init_lang (); scm_init_script (); - scm_init_oop_goops_goopscore_module (); + scm_init_goops (); scm_initialized_p = 1; @@ -588,13 +588,10 @@ scm_init_guile_1 (SCM_STACKITEM *base) scm_stack_checking_enabled_p = SCM_STACK_CHECKING_P; #endif - scm_load_startup_files (); - - /* these are located here, not from a deep understanding of the - module system, but as a way of avoiding segv and other - undesirable side effects that arise from various alternatives. */ scm_init_rdelim (); scm_init_rw (); + + scm_load_startup_files (); } /* Record here whether SCM_BOOT_GUILE_1 has already been called. This