merge revision(s) 36533: [Backport #7316]

 * tool/ytab.sed: fix for Bison 2.6.




git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37574 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 7 insertions, 1 deletions

diff --git a/tool/ytab.sed b/tool/ytab.sed
index f956c065e2..46317db284 100755
--- a/tool/ytab.sed
+++ b/tool/ytab.sed
@@ -5,6 +5,12 @@ i\
 a\
 #endif
 }
+/^extern int yydebug;/{
+i\
+#ifndef yydebug
+a\
+#endif
+}
 /^yydestruct.*yymsg/,/#endif/{
   /^yydestruct/{
     /parser/!{
diff --git a/version.h b/version.h
index 8132461c9f..04c19ae13a 100644
--- a/version.h
+++ b/version.h
@@ -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