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_5@66285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
ruby · Dec 8, 2018 · 2eadd92 · 2eadd92
1 parent aba207b
commit 2eadd92
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.5.4"
-#define RUBY_RELEASE_DATE "2018-12-05"
-#define RUBY_PATCHLEVEL 119
+#define RUBY_RELEASE_DATE "2018-12-08"
+#define RUBY_PATCHLEVEL 120
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 5
+#define RUBY_RELEASE_DAY 8
 
 #include "ruby/version.h"