summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-02-11 02:39:05 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-02-11 02:39:05 +0000
commitc7f86bb5f604f7d58e68839ebacb3c031f8b865b (patch)
tree1b1c0e30d29dd8e4378a0ca452ace5240bf1033f
parent1e96a30c9d410c215e7a628bcc8e1081d36926d8 (diff)
* template/fake.rb.in (CROSS_COMPILING): get rid of NameError.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30834 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rwxr-xr-xtemplate/fake.rb.in2
-rw-r--r--version.h4
3 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2a290da9dd..5c2e928e1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Feb 11 11:39:03 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * template/fake.rb.in (CROSS_COMPILING): get rid of NameError.
+
Thu Feb 10 23:12:34 2011 Tanaka Akira <akr@fsij.org>
* ext/dl/dl.h: parenthesize macro arguments.
diff --git a/template/fake.rb.in b/template/fake.rb.in
index 5bbb3353bf..7bfa0aef01 100755
--- a/template/fake.rb.in
+++ b/template/fake.rb.in
@@ -6,7 +6,7 @@ ruby="${RUBY-$baseruby}"
"}" || "exit" "$?"
ruby=ruby
class Object
- remove_const :CROSS_COMPILING
+ remove_const :CROSS_COMPILING if defined?(CROSS_COMPILING)
CROSS_COMPILING = RUBY_PLATFORM
remove_const :RUBY_PLATFORM
remove_const :RUBY_VERSION
diff --git a/version.h b/version.h
index 22781bc3c6..49a8b3ff75 100644
--- a/version.h
+++ b/version.h
@@ -1,11 +1,11 @@
#define RUBY_VERSION "1.9.3"
-#define RUBY_RELEASE_DATE "2011-02-10"
+#define RUBY_RELEASE_DATE "2011-02-11"
#define RUBY_PATCHLEVEL -1
#define RUBY_BRANCH_NAME "trunk"
#define RUBY_RELEASE_YEAR 2011
#define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 10
+#define RUBY_RELEASE_DAY 11
#include "ruby/version.h"