usa	2012-11-09 13:25:58 +0900 (Fri, 09 Nov 2012)

  New Revision: 37574

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37574

  Log:
    merge revision(s) 36533: [Backport #7316]
    
     * tool/ytab.sed: fix for Bison 2.6.

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/tool/ytab.sed
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 37573)
+++ ruby_1_9_3/version.h	(revision 37574)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 320
+#define RUBY_PATCHLEVEL 321
 
 #define RUBY_RELEASE_DATE "2012-11-09"
 #define RUBY_RELEASE_YEAR 2012
Index: ruby_1_9_3/tool/ytab.sed
===================================================================
--- ruby_1_9_3/tool/ytab.sed	(revision 37573)
+++ ruby_1_9_3/tool/ytab.sed	(revision 37574)
@@ -5,6 +5,12 @@
 a\
 #endif
 }
+/^extern int yydebug;/{
+i\
+#ifndef yydebug
+a\
+#endif
+}
 /^yydestruct.*yymsg/,/#endif/{
   /^yydestruct/{
     /parser/!{

Property changes on: ruby_1_9_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r36533


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