diff options
author | Dirk Herrmann <dirk@dirk-herrmanns-seiten.de> | 2000-12-11 14:48:23 +0000 |
---|---|---|
committer | Dirk Herrmann <dirk@dirk-herrmanns-seiten.de> | 2000-12-11 14:48:23 +0000 |
commit | 85db4a2c8eead51392bb16ea383526ba1ddfd23f (patch) | |
tree | 85274049b74a2787ed5b22700cb40d063303468a /libguile/init.c | |
parent | 24737ba02af8cb63982f50b7df45955b4b375298 (diff) | |
download | guile-85db4a2c8eead51392bb16ea383526ba1ddfd23f.tar.gz |
* Initialize symbols using SCM_(GLOBAL_)?SYMBOL instead of scm_sysintern...
* Use scm_str2symbol instead of scm_sysintern0.
* Garbage collection initialization code now within gc.c only.
Diffstat (limited to 'libguile/init.c')
-rw-r--r-- | libguile/init.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/libguile/init.c b/libguile/init.c index b4d7467d8..b703dcf17 100644 --- a/libguile/init.c +++ b/libguile/init.c @@ -368,20 +368,6 @@ scm_load_startup_files () } } -/* Get an integer from an environment variable. */ -static int -scm_i_getenv_int (const char *var, int def) -{ - char *end, *val = getenv (var); - long res; - if (!val) - return def; - res = strtol (val, &end, 10); - if (end == val) - return def; - return res; -} - /* The main init code. */ @@ -482,11 +468,7 @@ scm_init_guile_1 (SCM_STACKITEM *base) #ifdef GUILE_DEBUG_MALLOC scm_debug_malloc_prehistory (); #endif - scm_init_storage (scm_i_getenv_int ("GUILE_INIT_SEGMENT_SIZE_1", 0), - scm_i_getenv_int ("GUILE_MIN_YIELD_1", 0), - scm_i_getenv_int ("GUILE_INIT_SEGMENT_SIZE_2", 0), - scm_i_getenv_int ("GUILE_MIN_YIELD_2", 0), - scm_i_getenv_int ("GUILE_MAX_SEGMENT_SIZE", 0)); + scm_init_storage (); scm_struct_prehistory (); /* Must come after scm_init_storage */ scm_weaks_prehistory (); /* Must come after scm_init_storage */ scm_init_subr_table (); @@ -498,6 +480,7 @@ scm_init_guile_1 (SCM_STACKITEM *base) #endif start_stack (base); scm_init_gsubr (); + scm_init_procprop (); scm_init_environments (); scm_init_feature (); scm_init_alist (); @@ -542,7 +525,6 @@ scm_init_guile_1 (SCM_STACKITEM *base) scm_init_regex_posix (); #endif scm_init_procs (); - scm_init_procprop (); scm_init_scmsigs (); #ifdef HAVE_NETWORKING scm_init_net_db (); |