ruby-changes:46094
From: nagachika <ko1@a...>
Date: Tue, 28 Mar 2017 00:51:08 +0900 (JST)
Subject: [ruby-changes:46094] nagachika:r58165 (ruby_2_3): merge revision(s) 58057: [Backport #13353]
nagachika 2017-03-28 00:51:02 +0900 (Tue, 28 Mar 2017) New Revision: 58165 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=58165 Log: merge revision(s) 58057: [Backport #13353] stringio.c: RB_INTEGER_TYPE_P * ext/stringio/stringio.c (RB_INTEGER_TYPE_P): fallback definition for 2.3 or earlier. Modified directories: branches/ruby_2_3/ Modified files: branches/ruby_2_3/ext/stringio/stringio.c branches/ruby_2_3/version.h Index: ruby_2_3/version.h =================================================================== --- ruby_2_3/version.h (revision 58164) +++ ruby_2_3/version.h (revision 58165) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1 #define RUBY_VERSION "2.3.3" #define RUBY_RELEASE_DATE "2017-03-28" -#define RUBY_PATCHLEVEL 274 +#define RUBY_PATCHLEVEL 275 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 3 Index: ruby_2_3/ext/stringio/stringio.c =================================================================== --- ruby_2_3/ext/stringio/stringio.c (revision 58164) +++ ruby_2_3/ext/stringio/stringio.c (revision 58165) @@ -20,6 +20,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ext/stringio/stringio.c#L20 #include <sys/fcntl.h> #endif +#ifndef RB_INTEGER_TYPE_P +# define RB_INTEGER_TYPE_P(c) (FIXNUM_P(c) || RB_TYPE_P(c, T_BIGNUM)) +#endif + struct StringIO { VALUE string; rb_encoding *enc; Property changes on: ruby_2_3 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r58057 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/