aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-03-19 16:38:30 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-03-19 16:38:30 +0000
commit56f2d0aa98e2cbddf20d8c382d4ee824ebd3a4f2 (patch)
tree81e54df1e072a1392cc3308e115ec02e33258c11
parent08b53aa67a5da8daf602424847c4aeacd0ac75eb (diff)
downloadruby-56f2d0aa98e2cbddf20d8c382d4ee824ebd3a4f2.tar.gz
* thread.c (thread_start_func_2): store the result of first_func
as well as first_proc. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12102 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--thread.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a8575ff09e..7778cd7020 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-Tue Mar 20 01:02:23 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Mar 20 01:38:48 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * thread.c (thread_start_func_2): store the result of first_func
+ as well as first_proc.
* thread.c (thread_create_core): block is not used if first_func
is given.
diff --git a/thread.c b/thread.c
index 78471c28ee..14c0c654bf 100644
--- a/thread.c
+++ b/thread.c
@@ -304,7 +304,7 @@ thread_start_func_2(rb_thread_t *th, VALUE *stack_start)
RARRAY_LEN(args), RARRAY_PTR(args));
}
else {
- (*th->first_func)(th->first_func_arg);
+ th->value = (*th->first_func)(th->first_func_arg);
}
}
else {