summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-05 04:09:49 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-05 04:09:49 +0000
commitdb391b5d660c378c4770ed24f59261ec2edefdb1 (patch)
tree68b40c425fcf707a1ada47c9c037c76a8fac1cbe
parent447e3c3702c180d27a812c78097765b0a8d8793c (diff)
* eval.c (rb_thread_value): missed to change at r17874. [ruby-core:17595]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@17886 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--eval.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b4bcb2c612..740b99f143 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jul 5 13:09:47 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_thread_value): missed to change at r17874. [ruby-core:17595]
+
Sat Jul 5 00:33:08 2008 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* lib/erb.rb (PercentScanner#scan): fix %% line bug. [ruby-core:17491]
diff --git a/eval.c b/eval.c
index 3fedc6d361..bfe5f36b0e 100644
--- a/eval.c
+++ b/eval.c
@@ -11361,6 +11361,7 @@ rb_thread_select(max, read, write, except, timeout)
}
static int rb_thread_join0 _((rb_thread_t, double));
+int rb_thread_join _((VALUE, double));
static int
rb_thread_join0(th, limit)
@@ -12456,7 +12457,7 @@ rb_thread_value(thread)
{
rb_thread_t th = rb_thread_check(thread);
- while (!rb_thread_join(th, DELAY_INFTY));
+ while (!rb_thread_join0(th, DELAY_INFTY));
return th->result;
}