diff options
author | Andy Wingo <wingo@pobox.com> | 2009-12-05 11:16:54 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2009-12-05 11:16:54 +0100 |
commit | 1be8532fdb7715451b939571f9a147635df9cd65 (patch) | |
tree | fc68f9fdbd401eb9ad323762a08d6593d98f0e75 /libguile/init.c | |
parent | dd3a26f3da712564a294ad5890de12bcc6cb8849 (diff) | |
download | guile-1be8532fdb7715451b939571f9a147635df9cd65.tar.gz |
some scm_i_init_guile cleanups
* libguile/init.c (scm_i_init_guile): Since hash tables are tc7 objects,
things that depend on hash tables no longer depend on smobs, so move
smob_prehistory up a bit. No more struct_prehistory.
* libguile/struct.h:
* libguile/struct.c (scm_struct_prehistory): Remove empty function.
Diffstat (limited to 'libguile/init.c')
-rw-r--r-- | libguile/init.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libguile/init.c b/libguile/init.c index 781c18112..05f5c973f 100644 --- a/libguile/init.c +++ b/libguile/init.c @@ -436,19 +436,16 @@ scm_i_init_guile (SCM_STACKITEM *base) scm_storage_prehistory (); scm_threads_prehistory (base); - scm_smob_prehistory (); scm_weaks_prehistory (); #ifdef GUILE_DEBUG_MALLOC scm_debug_malloc_prehistory (); #endif - if (scm_init_storage ()) /* requires threads_prehistory, - smob_prehistory and - hashtab_prehistory */ + if (scm_init_storage ()) /* requires threads_prehistory */ abort (); - scm_struct_prehistory (); /* requires storage */ + scm_smob_prehistory (); scm_symbols_prehistory (); /* requires storage */ - scm_modules_prehistory (); /* requires storage and hash tables */ + scm_modules_prehistory (); /* requires storage */ scm_init_variable (); /* all bindings need variables */ scm_init_continuations (); scm_init_root (); /* requires continuations */ |