From 17619f4c37e94e715cd03b21857cde637e867393 Mon Sep 17 00:00:00 2001 From: mental Date: Fri, 6 Jun 2008 03:19:11 +0000 Subject: merge r12278 from ruby_1_8 git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@1021 19e92222-5c0b-0410-8929-a290d50e31e9 --- projects/fastthread/ext/fastthread/fastthread.c | 8 ++++---- 1 file 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); } -- cgit v1.2.3-24-ge0c7