[Guile-commits] 07/33: Merge from stable-2.2

[Andy Wingo]

wingo pushed a commit to branch master
in repository guile.

commit 967f129f803db7ef6144852bfabdfab60923d18a
Merge: 558dfa4 a23ee74
Author: Andy Wingo <address@hidden>
Date:   Fri Aug 2 14:59:48 2019 +0200

    Merge from stable-2.2

 libguile/strings.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --cc libguile/strings.c
index 57c1b0c,180fae1..aab1044
--- a/libguile/strings.c
+++ b/libguile/strings.c
@@@ -2266,9 -2260,9 +2265,9 @@@ scm_to_stringn (SCM str, size_t *lenp, 
      }
    else
      {
-       buf = u32_conv_to_encoding (enc,
+       buf = u32_conv_to_encoding (encoding,
                                    (enum iconv_ilseq_handler) handler,
 -                                  (scm_t_uint32 *) scm_i_string_wide_chars 
(str),
 +                                  (uint32_t *) scm_i_string_wide_chars (str),
                                    ilen,
                                    NULL,
                                    NULL, &len);