aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--io.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 09e4859c28..50c4c8b0a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun May 9 06:15:21 2010 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+
+ * io.c (nogvl_copy_stream_sendfile): ISO C90 forbids mixed
+ declarations and code.
+
Sun May 9 02:57:02 2010 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/fiddle/lib/fiddle.rb: only require DL if it hasn't been required
diff --git a/io.c b/io.c
index f9c01f3839..b997b89172 100644
--- a/io.c
+++ b/io.c
@@ -8078,8 +8078,9 @@ nogvl_copy_stream_sendfile(struct copy_stream_struct *stp)
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;