[Guile-commits] 04/06: Fix scm_init_struct dependency on port conversion handlers

[Andy Wingo]

wingo pushed a commit to branch wip-port-refactor
in repository guile.

commit cf80502c0af8b0d0acee5b73b36a9fbb66ed7084
Author: Andy Wingo <wi...@pobox.com>
Date:   Thu Apr 14 11:04:53 2016 +0200

    Fix scm_init_struct dependency on port conversion handlers
    
    * libguile/struct.c (scm_init_struct): Use scm_from_latin1_string to
      avoid locale-dependency for what is really a latin1 string.  Also
      avoids an early dependency on the default port conversion handler,
      though I wonder if using port conversion handlers in strings is the
      right thing.
---
 libguile/struct.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libguile/struct.c b/libguile/struct.c
index 8bfbcf4..3bf2e36 100644
--- a/libguile/struct.c
+++ b/libguile/struct.c
@@ -990,10 +990,10 @@ scm_init_struct ()
      OBJ once OBJ has undergone class redefinition.  */
   GC_REGISTER_DISPLACEMENT (2 * sizeof (scm_t_bits));
 
-  required_vtable_fields = scm_from_locale_string (SCM_VTABLE_BASE_LAYOUT);
+  required_vtable_fields = scm_from_latin1_string (SCM_VTABLE_BASE_LAYOUT);
   scm_c_define ("standard-vtable-fields", required_vtable_fields);
-  required_applicable_fields = scm_from_locale_string 
(SCM_APPLICABLE_BASE_LAYOUT);
-  required_applicable_with_setter_fields = scm_from_locale_string 
(SCM_APPLICABLE_WITH_SETTER_BASE_LAYOUT);
+  required_applicable_fields = scm_from_latin1_string 
(SCM_APPLICABLE_BASE_LAYOUT);
+  required_applicable_with_setter_fields = scm_from_latin1_string 
(SCM_APPLICABLE_WITH_SETTER_BASE_LAYOUT);
 
   scm_standard_vtable_vtable =
     scm_i_make_vtable_vtable (required_vtable_fields);