summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2020-03-10 11:41:32 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2020-03-10 11:41:32 +0000
commit617e7ee05c400cb6370b5fa8181552d0f512c777 (patch)
tree1204001acd1c18aa4bba6a32a4f5755df1cb1205
parent981e83d20e875b9b1b996b149ba8429bba68c1da (diff)
r66845 introduced mixed declarations and code.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67843 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--io.c6
-rw-r--r--version.h6
2 files changed, 7 insertions, 5 deletions
diff --git a/io.c b/io.c
index 94e425a277..3f7dbde50d 100644
--- a/io.c
+++ b/io.c
@@ -4261,6 +4261,8 @@ VALUE
rb_io_ungetbyte(VALUE io, VALUE b)
{
rb_io_t *fptr;
+ VALUE v;
+ unsigned char c;
GetOpenFile(io, fptr);
rb_io_check_byte_readable(fptr);
@@ -4269,8 +4271,8 @@ rb_io_ungetbyte(VALUE io, VALUE b)
return Qnil;
case T_FIXNUM:
case T_BIGNUM: ;
- VALUE v = rb_int_modulo(b, INT2FIX(256));
- unsigned char c = NUM2INT(v) & 0xFF;
+ v = rb_int_modulo(b, INT2FIX(256));
+ c = NUM2INT(v) & 0xFF;
b = rb_str_new((const char *)&c, 1);
break;
default:
diff --git a/version.h b/version.h
index 05efacb081..d02090f05e 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#define RUBY_VERSION "2.6.6"
-#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 130
+#define RUBY_RELEASE_DATE "2020-03-10"
+#define RUBY_PATCHLEVEL 131
#define RUBY_RELEASE_YEAR 2020
#define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 8
+#define RUBY_RELEASE_DAY 10
#include "ruby/version.h"