ruby-changes:60352
From: nagachika <ko1@a...>
Date: Tue, 10 Mar 2020 20:41:48 +0900 (JST)
Subject: [ruby-changes:60352] 617e7ee05c (ruby_2_6): r66845 introduced mixed declarations and code.
https://git.ruby-lang.org/ruby.git/commit/?id=617e7ee05c From 617e7ee05c400cb6370b5fa8181552d0f512c777 Mon Sep 17 00:00:00 2001 From: nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> Date: Tue, 10 Mar 2020 11:41:32 +0000 Subject: 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 diff --git a/io.c b/io.c index 94e425a..3f7dbde 100644 --- a/io.c +++ b/io.c @@ -4261,6 +4261,8 @@ VALUE https://github.com/ruby/ruby/blob/trunk/io.c#L4261 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) https://github.com/ruby/ruby/blob/trunk/io.c#L4271 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 05efacb..d02090f 100644 --- a/version.h +++ b/version.h @@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L1 #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" -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/