summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-05-09 02:14:52 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-05-09 02:14:52 +0000
commit127a4040aba260ffe24f8e8a77760f4ef833d415 (patch)
tree8ae599a912dc3679d7738d95f8af4d8ec6941f8f
parent77869020e6ccaee63514e44ee954af3eb071a29f (diff)
downloadruby-127a4040aba260ffe24f8e8a77760f4ef833d415.tar.gz
ruby-127a4040aba260ffe24f8e8a77760f4ef833d415.tar.xz
ruby-127a4040aba260ffe24f8e8a77760f4ef833d415.zip
* vm_eval.c (rb_f_catch): gets rid of issue with gcc 4.4. a patch
from Alexey Froloff in [ruby-core:23398]. [ruby-core:22924] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@23371 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--version.h4
-rw-r--r--vm_eval.c2
3 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f90497560..5e4d14ca7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat May 9 11:14:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * vm_eval.c (rb_f_catch): gets rid of issue with gcc 4.4. a patch
+ from Alexey Froloff in [ruby-core:23398]. [ruby-core:22924]
+
Fri May 8 19:38:54 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (try_link0): removes waste dSYM directories lef
diff --git a/version.h b/version.h
index a24c6356c..701ead060 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2"
-#define RUBY_RELEASE_DATE "2009-05-08"
+#define RUBY_RELEASE_DATE "2009-05-09"
#define RUBY_PATCHLEVEL -1
#define RUBY_BRANCH_NAME "trunk"
@@ -8,7 +8,7 @@
#define RUBY_VERSION_TEENY 1
#define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 8
+#define RUBY_RELEASE_DAY 9
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];
diff --git a/vm_eval.c b/vm_eval.c
index 5935aaeac..8c2e10e61 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -1222,7 +1222,7 @@ rb_f_catch(int argc, VALUE *argv)
{
VALUE tag;
int state;
- VALUE val = Qnil; /* OK */
+ volatile VALUE val = Qnil; /* OK */
rb_thread_t *th = GET_THREAD();
rb_control_frame_t *saved_cfp = th->cfp;