summaryrefslogtreecommitdiff
path: root/libguile/init.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2017-02-28 17:02:25 +0100
committerAndy Wingo <wingo@pobox.com>2017-02-28 17:02:25 +0100
commit33514ffe22b8cd15ff7ba95bcee80a534b2bbc2a (patch)
tree796ef13739d8021f597020ef5c168cfa12fd3fd6 /libguile/init.c
parentf3a1872703bf8b9b8f92bbdba01aa75927bd1b8f (diff)
downloadguile-33514ffe22b8cd15ff7ba95bcee80a534b2bbc2a.tar.gz
Fix segfault introduced with R6RS port commit
* libguile/init.c (scm_i_init_guile): Move scm_register_r6rs_ports later, so that defining port types hsa the SCM trampoline subrs defined. * libguile/bytevectors.c (scm_bootstrap_bytevectors): Cosmetic changes.
Diffstat (limited to 'libguile/init.c')
-rw-r--r--libguile/init.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libguile/init.c b/libguile/init.c
index a8f690b62..1a6f599fa 100644
--- a/libguile/init.c
+++ b/libguile/init.c
@@ -399,7 +399,6 @@ scm_i_init_guile (void *base)
scm_bootstrap_programs ();
scm_bootstrap_vm ();
scm_register_atomic ();
- scm_register_r6rs_ports ();
scm_register_fdes_finalizers ();
scm_register_foreign ();
scm_register_foreign_object ();
@@ -431,6 +430,7 @@ scm_i_init_guile (void *base)
scm_init_feature ();
scm_init_backtrace ();
scm_init_ports ();
+ scm_register_r6rs_ports (); /* requires ports */
scm_init_fports ();
scm_init_strports ();
scm_init_hash ();