diff options
author | Andy Wingo <wingo@pobox.com> | 2011-08-31 09:34:54 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2011-08-31 09:34:54 +0200 |
commit | 8b66aa8f5496a515ca133d6d2c37a06f6ec1720d (patch) | |
tree | ca666d93b6c310c6d76f8a0f0051407b9c92ee40 /libguile/strings.c | |
parent | 02620dd9a628ec40ec4324adca9b82cd0442d1d2 (diff) | |
parent | 0b4f77192da214690aa811d13bb6a7f6dd576445 (diff) | |
download | guile-8b66aa8f5496a515ca133d6d2c37a06f6ec1720d.tar.gz |
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts:
libguile/bytevectors.c
libguile/bytevectors.h
libguile/objcodes.c
libguile/r6rs-ports.c
libguile/strings.c
libguile/vm.c
Diffstat (limited to 'libguile/strings.c')
-rw-r--r-- | libguile/strings.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libguile/strings.c b/libguile/strings.c index b43ccaba2..dd859c4d3 100644 --- a/libguile/strings.c +++ b/libguile/strings.c @@ -1489,7 +1489,7 @@ scm_from_stringn (const char *str, size_t len, const char *encoding, buf = scm_gc_malloc_pointerless (len, "bytevector"); memcpy (buf, str, len); - bv = scm_c_take_bytevector (buf, len, SCM_BOOL_F); + bv = scm_c_take_gc_bytevector (buf, len, SCM_BOOL_F); scm_decoding_error (__func__, errno, "input locale conversion error", bv); |