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
This commit is contained in:
naruse 2014-01-22 17:41:54 +00:00
parent 2b93dbd8e7
commit d1b23d1f78
2 changed files with 10 additions and 4 deletions

View File

@ -5,6 +5,12 @@ i\
a\
#endif
}
/^extern int yydebug;/{
i\
#ifndef yydebug
a\
#endif
}
/^yydestruct.*yymsg/,/#endif/{
/^yydestruct/{
/parser/!{

View File

@ -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"