From d1b23d1f78a9262c053283e5a7753ef7b99d4e59 Mon Sep 17 00:00:00 2001 From: naruse Date: Wed, 22 Jan 2014 17:41:54 +0000 Subject: [PATCH] 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 --- tool/ytab.sed | 6 ++++++ version.h | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tool/ytab.sed b/tool/ytab.sed index f956c065e282b4..46317db28486c8 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 e7443a14117f38..67b4478ad18de6 100644 --- 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"