summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-01-31 11:08:07 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-01-31 11:08:07 +0000
commit05b05a8f56fbf9d1558c108d8eee3a09e4a78823 (patch)
treef03b4fbece9f151b6360e98b966ad79ad0259203
parent0f1b218fb4349fc1c1649f9fb1377e88152043cc (diff)
merge revision(s) 65667: [Backport #15284]
Fix for bison 3.2 [Bug #15284] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@66970 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rwxr-xr-xtool/ytab.sed1
-rw-r--r--version.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/tool/ytab.sed b/tool/ytab.sed
index a9599ce0ed..a3b411aa8f 100755
--- a/tool/ytab.sed
+++ b/tool/ytab.sed
@@ -52,6 +52,7 @@ a\
s/fprintf *(stderr,/YYFPRINTF (parser,/g
}
s/\( YYFPRINTF *(\)yyoutput,/\1parser,/
+s/\( YYFPRINTF *(\)yyo,/\1parser,/
s/\( YYFPRINTF *(\)stderr,/\1parser,/
s/\( YYDPRINTF *((\)stderr,/\1parser,/
s/^\([ ]*\)\(yyerror[ ]*([ ]*parser,\)/\1parser_\2/
diff --git a/version.h b/version.h
index 1a12e9a472..85db0ebd9a 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.4.6"
#define RUBY_RELEASE_DATE "2019-01-31"
-#define RUBY_PATCHLEVEL 345
+#define RUBY_PATCHLEVEL 346
#define RUBY_RELEASE_YEAR 2019
#define RUBY_RELEASE_MONTH 1