diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-09 04:25:58 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-09 04:25:58 +0000 |
commit | 014347511c17615c9958383621a3c945fafefa81 (patch) | |
tree | a0dd22871bcdc7eebef819c2603675cd4a8b7119 | |
parent | 995e42817c01111bc3dfeb092d3ed7e080edd8c2 (diff) |
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
-rwxr-xr-x | tool/ytab.sed | 6 | ||||
-rw-r--r-- | version.h | 2 |
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/!{ @@ -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 |