yugui	2010-12-02 17:07:04 +0900 (Thu, 02 Dec 2010)

  New Revision: 30041

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

  Log:
    merges r29454 from trunk into ruby_1_9_2.
    --
    * io.c (rb_io_ungetc): always see Bignum. On 32bit valid value
      may be a Bignum. On 64bit for errors. [ruby-dev:42366]

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

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 30040)
+++ ruby_1_9_2/ChangeLog	(revision 30041)
@@ -1,3 +1,8 @@
+Tue Oct 12 18:25:43 2010  NARUSE, Yui  <naruse@r...>
+
+	* io.c (rb_io_ungetc): always see Bignum. On 32bit valid value
+	  may be a Bignum. On 64bit for errors. [ruby-dev:42366]
+
 Tue Oct 12 18:25:04 2010  NARUSE, Yui  <naruse@r...>
 
 	* string.c (rb_str_concat): use unsigned int for GB18030.
Index: ruby_1_9_2/io.c
===================================================================
--- ruby_1_9_2/io.c	(revision 30040)
+++ ruby_1_9_2/io.c	(revision 30041)
@@ -3195,11 +3195,9 @@
     if (FIXNUM_P(c)) {
 	c = rb_enc_uint_chr(FIX2UINT(c), io_read_encoding(fptr));
     }
-#if SIZEOF_LONG > SIZEOF_INT
     else if (TYPE(c) == T_BIGNUM) {
 	c = rb_enc_uint_chr(NUM2UINT(c), io_read_encoding(fptr));
     }
-#endif
     else {
 	SafeStringValue(c);
     }
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 30040)
+++ ruby_1_9_2/version.h	(revision 30041)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 71
+#define RUBY_PATCHLEVEL 72
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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