diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-04-07 21:54:11 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-04-07 21:54:11 +0000 |
commit | 0e19adc87fde15ae047c9b9ec4341c0d7d9ce431 (patch) | |
tree | 0c834fd27be69c48f93ffa9ce03a9cfe9cf7e53d /io.c | |
parent | 45a500e5689542988072162a18e794bde00f7c21 (diff) | |
download | ruby-0e19adc87fde15ae047c9b9ec4341c0d7d9ce431.tar.gz |
merge revision(s) 35255:
* io.c (io_unread): cast as long the value for extra_max.
[ruby-core:44137] [Bug #6257]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35256 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r-- | io.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -290,7 +290,7 @@ inline static int set_binary_mode_with_seek_cur(rb_io_t *fptr) { return setmode(fptr->fd, O_BINARY); } /* add extra offset for removed '\r' in rbuf */ - extra_max = pos - fptr->rbuf.len; + extra_max = (long)(pos - fptr->rbuf.len); p = fptr->rbuf.ptr + fptr->rbuf.off; for (i = 0; i < fptr->rbuf.len; i++) { if (*p == '\n') newlines++; |