merge revision(s) 36533:

* tool/ytab.sed: fix for Bison 2.6. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@44682 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
ruby · Jan 22, 2014 · d1b23d1 · d1b23d1
1 parent 2b93dbd
commit d1b23d1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git 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
@@ -1,13 +1,13 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 326
+#define RUBY_PATCHLEVEL 327
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
 
-#define RUBY_RELEASE_YEAR 2013
-#define RUBY_RELEASE_MONTH 12
+#define RUBY_RELEASE_YEAR 2014
+#define RUBY_RELEASE_MONTH 1
 #define RUBY_RELEASE_DAY 23
-#define RUBY_RELEASE_DATE "2013-12-23"
+#define RUBY_RELEASE_DATE "2014-01-23"
 
 #include "ruby/version.h"