diff options
| author | Mark H Weaver <mhw@netris.org> | 2012-10-30 23:46:31 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2012-10-30 23:46:31 -0400 |
| commit | fa980bcc0f5b186b98d84fc5d165d35fcbb5d5ec (patch) | |
| tree | 411ee841f7526fe7138e42cf399911518df06309 /libguile/strings.c | |
| parent | e088b09d7dce5d78c96288778969876b6d25d726 (diff) | |
| parent | 10744b7c5007ccac19ea9654be6e749fe6a60992 (diff) | |
| download | guile-fa980bcc0f5b186b98d84fc5d165d35fcbb5d5ec.tar.gz | |
Merge remote-tracking branch 'origin/stable-2.0'
Moved scm_i_struct_hash from struct.c to hash.c and made it static.
The port's alist is now a field of 'scm_t_port'.
Conflicts:
libguile/arrays.c
libguile/hash.c
libguile/ports.c
libguile/print.h
libguile/read.c
Diffstat (limited to 'libguile/strings.c')
| -rw-r--r-- | libguile/strings.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libguile/strings.c b/libguile/strings.c index 7c5550fb3..5130cb362 100644 --- a/libguile/strings.c +++ b/libguile/strings.c @@ -1997,7 +1997,10 @@ u32_u8_length_in_bytes (const scm_t_uint32 *str, size_t len) char * scm_to_utf8_stringn (SCM str, size_t *lenp) +#define FUNC_NAME "scm_to_utf8_stringn" { + SCM_VALIDATE_STRING (1, str); + if (scm_i_is_narrow_string (str)) return (char *) latin1_to_u8 ((scm_t_uint8 *) scm_i_string_chars (str), scm_i_string_length (str), @@ -2044,6 +2047,7 @@ scm_to_utf8_stringn (SCM str, size_t *lenp) } } } +#undef FUNC_NAME scm_t_wchar * scm_to_utf32_string (SCM str) |