summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-27 15:51:02 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-27 15:51:02 +0000
commit7cbc39be6973b3a6ade414f42cdcf156efb3dee6 (patch)
treed70ed4e91b71c637ed5befea96b96760468106e3
parent715f997ab706df797dd253d9ee706b1326365eae (diff)
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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@58165 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ext/stringio/stringio.c4
-rw-r--r--version.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c
index 3e9821527c..8ae4cd5b2e 100644
--- a/ext/stringio/stringio.c
+++ b/ext/stringio/stringio.c
@@ -20,6 +20,10 @@
#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;
diff --git a/version.h b/version.h
index 88676af2d9..b677ea3e30 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#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