diff options
author | Stefan Jahn <stefan@lkcc.org> | 2004-09-03 19:45:37 +0000 |
---|---|---|
committer | Stefan Jahn <stefan@lkcc.org> | 2004-09-03 19:45:37 +0000 |
commit | edea856ce5ace366441ca91484f69c307e629f96 (patch) | |
tree | 0d9506601659d0f8f3ca9ca91ef37163e3a3262f /libguile/strings.c | |
parent | 23311fb045a0dae78571c270a927e73c7c193060 (diff) | |
download | guile-edea856ce5ace366441ca91484f69c307e629f96.tar.gz |
2004-09-03 Stefan Jahn <stefan@lkcc.org>
* configure.in (isinf): Let configure find the isinf() function
on MinGW32 systems.
2004-09-03 Stefan Jahn <stefan@lkcc.org>
* threads.c (scm_threads_mark_stacks): Fixed local variable
definitions.
* strings.c (scm_i_substring_copy, s_scm_string_append): Fixed
local variable definitions.
* stime.c (_POSIX_C_SOURCE): Do not define this item on
MinGW32 because it conflicts with its pthread headers.
(s_scm_mktime): Consider the HAVE_STRUCT_TM_TM_ZONE define.
(s_scm_strftime): Using scm_from_locale_string() instead of
scm_makfrom0str().
* posix.c (s_scm_putenv): Fixed typo in the !HAVE_UNSETENV
part.
* numbers.c (scm_init_numbers): Removed check_sanity() call
inside GUILE_DEBUG. The function has been removed somewhen...
* filesys.c (_POSIX_C_SOURCE): Do not define this item on
MinGW32 because it conflicts with its pthread headers.
2004-09-03 Stefan Jahn <stefan@lkcc.org>
* srfi-1.c, srfi-1.h: Renamed any 'lst1' into 'list1' because
lst1 is a #define on Win32 systems.
Diffstat (limited to 'libguile/strings.c')
-rw-r--r-- | libguile/strings.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libguile/strings.c b/libguile/strings.c index 9c1057833..cac77b101 100644 --- a/libguile/strings.c +++ b/libguile/strings.c @@ -215,10 +215,10 @@ SCM scm_i_substring_copy (SCM str, size_t start, size_t end) { size_t len = end - start; - SCM buf; + SCM buf, my_buf; size_t str_start; get_str_buf_start (&str, &buf, &str_start); - SCM my_buf = make_stringbuf (len); + my_buf = make_stringbuf (len); memcpy (STRINGBUF_CHARS (my_buf), STRINGBUF_CHARS (buf) + str_start + start, len); scm_remember_upto_here_1 (buf); @@ -732,9 +732,10 @@ SCM_DEFINE (scm_string_append, "string-append", 0, 0, 1, res = scm_i_make_string (i, &data); for (l = args; !SCM_NULLP (l); l = SCM_CDR (l)) { + size_t len; s = SCM_CAR (l); SCM_VALIDATE_STRING (SCM_ARGn, s); - size_t len = scm_i_string_length (s); + len = scm_i_string_length (s); memcpy (data, scm_i_string_chars (s), len); data += len; scm_remember_upto_here_1 (s); |