summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2009-12-05 11:16:54 +0100
committerAndy Wingo <wingo@pobox.com>2009-12-05 11:16:54 +0100
commit1be8532fdb7715451b939571f9a147635df9cd65 (patch)
treefc68f9fdbd401eb9ad323762a08d6593d98f0e75
parentdd3a26f3da712564a294ad5890de12bcc6cb8849 (diff)
downloadguile-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.
-rw-r--r--libguile/init.c9
-rw-r--r--libguile/struct.c6
-rw-r--r--libguile/struct.h1
3 files changed, 3 insertions, 13 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 */
diff --git a/libguile/struct.c b/libguile/struct.c
index 9fd73a6c0..cd2c441e3 100644
--- a/libguile/struct.c
+++ b/libguile/struct.c
@@ -854,12 +854,6 @@ scm_print_struct (SCM exp, SCM port, scm_print_state *pstate)
}
void
-scm_struct_prehistory ()
-{
- /* Empty. */
-}
-
-void
scm_init_struct ()
{
SCM scm_applicable_struct_vtable_vtable;
diff --git a/libguile/struct.h b/libguile/struct.h
index 9372cecda..1e80fc188 100644
--- a/libguile/struct.h
+++ b/libguile/struct.h
@@ -157,7 +157,6 @@ SCM_API SCM scm_struct_create_handle (SCM obj);
SCM_API SCM scm_struct_vtable_name (SCM vtable);
SCM_API SCM scm_set_struct_vtable_name_x (SCM vtable, SCM name);
SCM_API void scm_print_struct (SCM exp, SCM port, scm_print_state *);
-SCM_API void scm_struct_prehistory (void);
SCM_INTERNAL SCM scm_i_struct_equalp (SCM s1, SCM s2);
SCM_INTERNAL unsigned long scm_struct_ihashq (SCM, unsigned long, void *);