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 | |
parent | 45a500e5689542988072162a18e794bde00f7c21 (diff) |
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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | io.c | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sun Apr 8 06:53:55 2012 NARUSE, Yui <naruse@ruby-lang.org> + + * io.c (io_unread): cast as long the value for extra_max. + [ruby-core:44137] [Bug #6257] + Sat Apr 7 10:28:40 2012 Aaron Patterson <aaron@tenderlovemaking.com> * ext/psych/lib/psych.rb: bumping up psych version to match release. @@ -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++; @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 177 +#define RUBY_PATCHLEVEL 178 #define RUBY_RELEASE_DATE "2012-04-08" #define RUBY_RELEASE_YEAR 2012 |