summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-11-12 10:47:46 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-11-12 10:47:46 +0000
commitfec4b9aa3708ee8659f0dc680ac21df0c3b15155 (patch)
treeae4c7fcc2464a20c70e705b23b2a74c6fec5e775
parent48ce70306001b058eb1412b993fcaa96800e8c00 (diff)
downloadruby-fec4b9aa3708ee8659f0dc680ac21df0c3b15155.tar.gz
ruby-fec4b9aa3708ee8659f0dc680ac21df0c3b15155.tar.xz
ruby-fec4b9aa3708ee8659f0dc680ac21df0c3b15155.zip
* thread.c (call_trace_proc): should return value.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13900 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--thread.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ffc6e8309..835cc5917 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Nov 12 19:47:29 2007 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * thread.c (call_trace_proc): should return value.
+
Mon Nov 12 19:45:18 2007 NAKAMURA Usaku <usa@ruby-lang.org>
* {bcc,win}32/Makefile.sub (miniruby): use $(COMMONOBJS) and $(DMYEXT)
diff --git a/thread.c b/thread.c
index f059e0dc3..a80445dca 100644
--- a/thread.c
+++ b/thread.c
@@ -2902,7 +2902,7 @@ call_trace_proc(VALUE args)
rb_thread_method_id_and_klass(GET_THREAD(), &id, &klass);
}
if (id == ID_ALLOCATOR)
- return;
+ return Qnil;
if (klass) {
if (TYPE(klass) == T_ICLASS) {
klass = RBASIC(klass)->klass;