Index: libguile/strings.c
===================================================================
RCS file: /cvsroot/guile/guile/guile-core/libguile/strings.c,v
retrieving revision 1.89
diff -u -r1.89 strings.c
--- libguile/strings.c	27 Aug 2004 12:45:37 -0000	1.89
+++ libguile/strings.c	29 Aug 2004 09:11:43 -0000
@@ -215,10 +215,10 @@
 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,11 @@
   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);
Index: libguile/threads.c
===================================================================
RCS file: /cvsroot/guile/guile/guile-core/libguile/threads.c,v
retrieving revision 1.65
diff -u -r1.65 threads.c
--- libguile/threads.c	19 Aug 2004 17:16:01 -0000	1.65
+++ libguile/threads.c	29 Aug 2004 09:11:43 -0000
@@ -937,6 +937,7 @@
 scm_threads_mark_stacks (void)
 {
   volatile SCM c;
+  long stack_len;
 
   for (c = all_threads; !SCM_NULLP (c); c = SCM_CDR (c))
     {
@@ -955,10 +956,10 @@
 	}
 
 #if SCM_STACK_GROWS_UP
-      long stack_len = t->top - t->base;
+      stack_len = t->top - t->base;
       scm_mark_locations (t->base, stack_len);
 #else
-      long stack_len = t->base - t->top;
+      stack_len = t->base - t->top;
       scm_mark_locations (t->top, stack_len);
 #endif
       scm_mark_locations ((SCM_STACKITEM *) t->regs,