naruse	2012-04-08 06:54:11 +0900 (Sun, 08 Apr 2012)

  New Revision: 35256

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

  Log:
    merge revision(s) 35255:
    
    * io.c (io_unread): cast as long the value for extra_max.
      [ruby-core:44137] [Bug #6257]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/io.c
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 35255)
+++ ruby_1_9_3/ChangeLog	(revision 35256)
@@ -1,3 +1,8 @@
+Sun Apr  8 06:53:55 2012  NARUSE, Yui  <naruse@r...>
+
+	* 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@t...>
 
 	* ext/psych/lib/psych.rb: bumping up psych version to match release.
Index: ruby_1_9_3/io.c
===================================================================
--- ruby_1_9_3/io.c	(revision 35255)
+++ ruby_1_9_3/io.c	(revision 35256)
@@ -290,7 +290,7 @@
 	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++;
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 35255)
+++ ruby_1_9_3/version.h	(revision 35256)
@@ -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

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