ruby-changes:71702
From: usa <ko1@a...>
Date: Tue, 12 Apr 2022 19:53:01 +0900 (JST)
Subject: [ruby-changes:71702] 560a4cdf04 (ruby_2_6): fix for #16798 to Ruby 2.6 introduced C99 syntax [Backport #18387]
https://git.ruby-lang.org/ruby.git/commit/?id=560a4cdf04 From 560a4cdf0433a42b635384ba1e1324471f19b785 Mon Sep 17 00:00:00 2001 From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> Date: Tue, 12 Apr 2022 10:52:41 +0000 Subject: fix for #16798 to Ruby 2.6 introduced C99 syntax [Backport #18387] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67955 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- hash.c | 4 ++-- version.h | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hash.c b/hash.c index 38440f4b96..65a0419af3 100644 --- a/hash.c +++ b/hash.c @@ -5655,10 +5655,10 @@ env_invert(void) https://github.com/ruby/ruby/blob/trunk/hash.c#L5655 static void keylist_delete(VALUE keys, VALUE key) { - long keylen, elen; + long keylen, elen, i; const char *keyptr, *eptr; RSTRING_GETMEM(key, keyptr, keylen); - for (long i=0; i<RARRAY_LEN(keys); i++) { + for (i=0; i<RARRAY_LEN(keys); i++) { VALUE e = RARRAY_AREF(keys, i); RSTRING_GETMEM(e, eptr, elen); if (elen != keylen) continue; diff --git a/version.h b/version.h index 5918d07ced..0205d97e87 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.9" -#define RUBY_RELEASE_DATE "2021-11-24" -#define RUBY_PATCHLEVEL 207 +#define RUBY_RELEASE_DATE "2022-04-12" +#define RUBY_PATCHLEVEL 208 -#define RUBY_RELEASE_YEAR 2021 -#define RUBY_RELEASE_MONTH 11 -#define RUBY_RELEASE_DAY 24 +#define RUBY_RELEASE_YEAR 2022 +#define RUBY_RELEASE_MONTH 4 +#define RUBY_RELEASE_DAY 12 #include "ruby/version.h" -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/