usa	2019-01-31 20:08:07 +0900 (Thu, 31 Jan 2019)

  New Revision: 66970

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=66970

  Log:
    merge revision(s) 65667: [Backport #15284]
    
    Fix for bison 3.2 [Bug #15284]

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/tool/ytab.sed
    branches/ruby_2_4/version.h
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 66969)
+++ ruby_2_4/version.h	(revision 66970)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1
 #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
Index: ruby_2_4/tool/ytab.sed
===================================================================
--- ruby_2_4/tool/ytab.sed	(revision 66969)
+++ ruby_2_4/tool/ytab.sed	(revision 66970)
@@ -52,6 +52,7 @@ a\ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/tool/ytab.sed#L52
   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/
Index: ruby_2_4
===================================================================
--- ruby_2_4	(revision 66969)
+++ ruby_2_4	(revision 66970)

Property changes on: ruby_2_4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r65667

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/