diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-01-22 17:41:54 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-01-22 17:41:54 +0000 |
| commit | d1b23d1f78a9262c053283e5a7753ef7b99d4e59 (patch) | |
| tree | 1ffc0444ad0b1f14e20bcc49dda8737b599aa251 | |
| parent | 2b93dbd8e7e3d71dc4cb4c7e381974176b134c5b (diff) | |
| download | ruby-d1b23d1f78a9262c053283e5a7753ef7b99d4e59.tar.gz | |
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
| -rwxr-xr-x | tool/ytab.sed | 6 | ||||
| -rw-r--r-- | version.h | 8 |
2 files changed, 10 insertions, 4 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/!{ @@ -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" |