mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 19:50:24 +02:00
Code Activity

Fix segfault introduced with R6RS port commit

Browse source 
* 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.
This commit is contained in:
Andy Wingo 2017-02-28 17:02:25 +01:00
parent f3a1872703
commit 33514ffe22
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libguile/bytevectors.c
View file

@ -2095,10 +2095,14 @@ scm_bootstrap_bytevectors (void)
loaded. */ loaded. */
scm_null_bytevector = make_bytevector (0, SCM_ARRAY_ELEMENT_TYPE_VU8); scm_null_bytevector = make_bytevector (0, SCM_ARRAY_ELEMENT_TYPE_VU8);
scm_endianness_big = sym_big = scm_from_latin1_symbol ("big");
scm_endianness_little = sym_little = scm_from_latin1_symbol ("little");
#ifdef WORDS_BIGENDIAN #ifdef WORDS_BIGENDIAN
scm_i_native_endianness = scm_from_latin1_symbol ("big"); scm_i_native_endianness = sym_big;
#else #else
scm_i_native_endianness = scm_from_latin1_symbol ("little"); scm_i_native_endianness = sym_little;
#endif #endif
scm_c_register_extension ("libguile-" SCM_EFFECTIVE_VERSION, scm_c_register_extension ("libguile-" SCM_EFFECTIVE_VERSION,
@ -2109,9 +2113,6 @@ scm_bootstrap_bytevectors (void)
scm_i_register_vector_constructor scm_i_register_vector_constructor
(scm_i_array_element_types[SCM_ARRAY_ELEMENT_TYPE_VU8], (scm_i_array_element_types[SCM_ARRAY_ELEMENT_TYPE_VU8],
scm_make_bytevector); scm_make_bytevector);
scm_endianness_big = sym_big = scm_from_latin1_symbol ("big");
scm_endianness_little = sym_little = scm_from_latin1_symbol ("little");
} }
void void

2
libguile/init.c
View file

@ -399,7 +399,6 @@ scm_i_init_guile (void *base)
scm_bootstrap_programs (); scm_bootstrap_programs ();
scm_bootstrap_vm (); scm_bootstrap_vm ();
scm_register_atomic (); scm_register_atomic ();
scm_register_r6rs_ports ();
scm_register_fdes_finalizers (); scm_register_fdes_finalizers ();
scm_register_foreign (); scm_register_foreign ();
scm_register_foreign_object (); scm_register_foreign_object ();
@ -431,6 +430,7 @@ scm_i_init_guile (void *base)
scm_init_feature (); scm_init_feature ();
scm_init_backtrace (); scm_init_backtrace ();
scm_init_ports (); scm_init_ports ();
scm_register_r6rs_ports (); /* requires ports */
scm_init_fports (); scm_init_fports ();
scm_init_strports (); scm_init_strports ();
scm_init_hash (); scm_init_hash ();