From 39e50d214d1db4834acf4480a816a99b159385fc Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 14 May 2007 04:26:57 +0000
Subject: [PATCH] * ext/thread/thread.c (wait_list): supress a warning.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@12278 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog           | 4 ++++
 ext/thread/thread.c | 8 ++++----
 version.h           | 6 +++---
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index aee5e3e3f5..dab23751cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon May 14 13:28:03 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/thread/thread.c (wait_list): supress a warning.
+
 Thu May 10 15:21:51 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* ext/iconv/iconv.c (iconv_s_conv): rdoc fix.
diff --git a/ext/thread/thread.c b/ext/thread/thread.c
index b0badf11b8..700fc90bae 100644
--- a/ext/thread/thread.c
+++ b/ext/thread/thread.c
@@ -256,10 +256,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
@@ -793,8 +793,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);
 }
diff --git a/version.h b/version.h
index 58bd8d9f80..4e3df98eb1 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2007-05-10"
+#define RUBY_RELEASE_DATE "2007-05-14"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20070510
+#define RUBY_RELEASE_CODE 20070514
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2007
 #define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 10
+#define RUBY_RELEASE_DAY 14
 
 RUBY_EXTERN const char ruby_version[];
 RUBY_EXTERN const char ruby_release_date[];