merge r12278 from ruby_1_8

git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@1021 19e92222-5c0b-0410-8929-a290d50e31e9

1 files changed, 4 insertions, 4 deletions

diff --git a/projects/fastthread/ext/fastthread/fastthread.c b/projects/fastthread/ext/fastthread/fastthread.c
index 355ed00..2960efb 100644
--- a/projects/fastthread/ext/fastthread/fastthread.c
+++ b/projects/fastthread/ext/fastthread/fastthread.c
@@ -244,10 +244,10 @@ wait_list_cleanup(List *list)
     return Qnil;
 }
 
-static void
+static VALUE
 wait_list(List *list)
 {
-    rb_ensure(wait_list_inner, (VALUE)list, wait_list_cleanup, (VALUE)list);
+    return rb_ensure(wait_list_inner, (VALUE)list, wait_list_cleanup, (VALUE)list);
 }
 
 static void
@@ -777,8 +777,8 @@ static void
 free_queue(Queue *queue)
 {
     assert_no_survivors(&queue->mutex.waiting, "queue", queue);
-    assert_no_survivors(&queue->space_available.waiting, "queue", queue);
-    assert_no_survivors(&queue->value_available.waiting, "queue", queue);
+    assert_no_survivors(&queue->space_available.waiting, "queue(push)", queue);
+    assert_no_survivors(&queue->value_available.waiting, "queue(pop)", queue);
     finalize_queue(queue);
     xfree(queue);
 }