shyouhei	2010-05-09 02:41:49 +0900 (Sun, 09 May 2010)

  New Revision: 27684

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27684

  Log:
    * io.c (nogvl_copy_stream_sendfile): mixed decls not allowed.
    
    * include/ruby/ruby.h (rb_intern): C90 needs nonempty macro
      arguments.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/include/ruby/ruby.h
    branches/ruby_1_9_2/io.c

Index: ruby_1_9_2/include/ruby/ruby.h
===================================================================
--- ruby_1_9_2/include/ruby/ruby.h	(revision 27683)
+++ ruby_1_9_2/include/ruby/ruby.h	(revision 27684)
@@ -1078,8 +1078,8 @@
 /* __builtin_constant_p and statement expression is available
  * since gcc-2.7.2.3 at least. */
 #define rb_intern(str) \
-    (__builtin_constant_p(str) ? \
-        __extension__ (CONST_ID_CACHE(/**/, str)) : \
+    (__builtin_constant_p(str) ?
+        __extension__ (CONST_ID_CACHE((ID), str)) :     \
         rb_intern(str))
 #define rb_intern_const(str) \
     (__builtin_constant_p(str) ? \
Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 27683)
+++ ruby_1_9_2/ChangeLog	(revision 27684)
@@ -1,3 +1,10 @@
+Sun May  9 02:37:33 2010  URABE Shyouhei  <shyouhei@r...>
+
+	* io.c (nogvl_copy_stream_sendfile): mixed decls not allowed.
+
+	* include/ruby/ruby.h (rb_intern): C90 needs nonempty macro
+	  arguments.
+
 Sun May  9 01:15:18 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* cont.c (stackgrowdirection): removed duplicated code, use
Index: ruby_1_9_2/io.c
===================================================================
--- ruby_1_9_2/io.c	(revision 27683)
+++ ruby_1_9_2/io.c	(revision 27684)
@@ -8078,8 +8078,9 @@
         if (use_pread)
             copy_length = src_stat.st_size - src_offset;
         else {
+	    off_t cur;
 	    errno = 0;
-            off_t cur = lseek(stp->src_fd, 0, SEEK_CUR);
+            cur = lseek(stp->src_fd, 0, SEEK_CUR);
             if (cur == (off_t)-1 && errno) {
                 stp->syserr = "lseek";
                 stp->error_no = errno;

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/