diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-10 15:48:20 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-10 15:48:20 +0000 |
commit | cb0c05138018f004d28b8dfb6c7b08732f814ba6 (patch) | |
tree | 5ec30b164acf7d50ca11193aadaa2530d8b304e8 | |
parent | 0d946b214b0ae7f6a38907a0fb3186451ea0db5d (diff) |
merge revision(s) 39481: [Backport #7941]
* configure.in (unexpand_shvar): Use the numeric comparison
operator instead of '==' which is a ksh extention. [Bug #7941]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39702 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | version.h | 6 |
3 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Mon Mar 11 00:47:47 2013 Akinori MUSHA <knu@iDaemons.org> + + * configure.in (unexpand_shvar): Use the numeric comparison + operator instead of '==' which is a ksh extention. [Bug #7941] + Sun Mar 10 00:01:07 2013 Tadayoshi Funaba <tadf@dotrb.org> * ext/date/date_core.c: [ruby-core:52303] diff --git a/configure.in b/configure.in index 4c349880fd..8179e16d91 100644 --- a/configure.in +++ b/configure.in @@ -3205,7 +3205,7 @@ shvar_to_cpp() { unexpand_shvar() { local var=$1 val n v expr quote shift - test "$#" == 0 && return + test "$#" -eq 0 && return quote=['s/${[^${}"]*}/"&"/g'] for n do eval v='"$'$n'"' @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.0.0" -#define RUBY_RELEASE_DATE "2013-03-10" -#define RUBY_PATCHLEVEL 46 +#define RUBY_RELEASE_DATE "2013-03-11" +#define RUBY_PATCHLEVEL 47 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 10 +#define RUBY_RELEASE_DAY 11 #include "ruby/version.h" |