Move scheme_init_type to happen before MASTER GC is switched out

svn: r15048
This commit is contained in:
Kevin Tew 2009-06-02 16:24:12 +00:00
parent 38456e8b5f
commit 293d64cd15
3 changed files with 3 additions and 4 deletions

View File

@ -332,7 +332,7 @@ Scheme_Env *scheme_engine_instance_init() {
/* These calls must be made here so that they allocate out of the master GC */
scheme_init_symbol_table();
scheme_init_module_path_table();
scheme_init_type();
#if defined(MZ_PRECISE_GC) && defined(MZ_USE_PLACES)
GC_switch_out_master_gc();
@ -468,7 +468,6 @@ static void make_kernel_env(void)
/* The ordering of the first few init calls is important, so add to
the end of the list, not the beginning. */
MZTIMEIT(type, scheme_init_type(env));
MZTIMEIT(symbol-type, scheme_init_symbol_type(env));
MZTIMEIT(fun, scheme_init_fun(env));
MZTIMEIT(symbol, scheme_init_symbol(env));

View File

@ -169,7 +169,7 @@ Scheme_Thread *scheme_make_thread(void*);
void scheme_init_true_false(void);
void scheme_init_symbol_table(void);
void scheme_init_symbol_type(Scheme_Env *env);
void scheme_init_type(Scheme_Env *env);
void scheme_init_type();
void scheme_init_list(Scheme_Env *env);
void scheme_init_stx(Scheme_Env *env);
void scheme_init_module(Scheme_Env *env);

View File

@ -85,7 +85,7 @@ static void init_type_arrays()
}
void
scheme_init_type (Scheme_Env *env)
scheme_init_type ()
{
if (!type_names)
init_type_arrays();