[前][次][番号順一覧][スレッド一覧]

ruby-changes:15759

From: kazu <ko1@a...>
Date: Sun, 9 May 2010 07:13:19 +0900 (JST)
Subject: [ruby-changes:15759] Ruby:r27687 (trunk): * io.c (nogvl_copy_stream_sendfile): ISO C90 forbids mixed declarations and code.

kazu	2010-05-09 07:13:02 +0900 (Sun, 09 May 2010)

  New Revision: 27687

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

  Log:
    * io.c (nogvl_copy_stream_sendfile): ISO C90 forbids mixed declarations and code.

  Modified files:
    trunk/ChangeLog
    trunk/io.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 27686)
+++ ChangeLog	(revision 27687)
@@ -1,3 +1,8 @@
+Sun May  9 06:15:21 2010  Kazuhiro NISHIYAMA  <zn@m...>
+
+	* io.c (nogvl_copy_stream_sendfile): ISO C90 forbids mixed
+	  declarations and code.
+
 Sun May  9 02:57:02 2010  Aaron Patterson <aaron@t...>
 
 	* ext/fiddle/lib/fiddle.rb: only require DL if it hasn't been required
Index: io.c
===================================================================
--- io.c	(revision 27686)
+++ io.c	(revision 27687)
@@ -8078,8 +8078,9 @@
         if (use_pread)
             copy_length = src_stat.st_size - src_offset;
         else {
-	    errno = 0;
-            off_t cur = lseek(stp->src_fd, 0, SEEK_CUR);
+            off_t cur;
+            errno = 0;
+            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/

[前][次][番号順一覧][スレッド一覧]