Merge from ruby_1_8.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@16578 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 5 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index cdf0c15d8d..f0b398af28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun May 25 03:13:09 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* eval.c (Init_Thread): Initialize recursive_key.
+
 Sun May 25 02:45:49 2008  Akinori MUSHA  <knu@iDaemons.org>
 
 	* error.c (syserr_eqq): Use en.
diff --git a/eval.c b/eval.c
index 0434917bec..031a57b316 100644
--- a/eval.c
+++ b/eval.c
@@ -13289,6 +13289,7 @@ Init_Thread()
 {
     VALUE cThGroup;
 
+    recursive_key = rb_intern("__recursive_key__");
     rb_eThreadError = rb_define_class("ThreadError", rb_eStandardError);
     rb_cThread = rb_define_class("Thread", rb_cObject);
     rb_undef_alloc_func(rb_cThread);