4 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 1eb5ae0c65..3efaca8b20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun 18 11:29:49 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* intern.h, ext/thread/thread.c: moved prototype of rb_thread_status()
+	  to get rid of error in C++.  [ruby-list:43615]
+
 Sun Jun 10 13:47:36 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* test/ruby/test_beginendblock.rb (test_should_propagate_signaled):
diff --git a/ext/thread/thread.c b/ext/thread/thread.c
index 910b326696..43dfc348ed 100644
--- a/ext/thread/thread.c
+++ b/ext/thread/thread.c
@@ -14,6 +14,8 @@
 #include <rubysig.h>
 #include <node.h>
 
+enum rb_thread_status rb_thread_status _((VALUE));
+
 static VALUE rb_cMutex;
 static VALUE rb_cConditionVariable;
 static VALUE rb_cQueue;
diff --git a/intern.h b/intern.h
index d063d53495..6bdbc49d4a 100644
--- a/intern.h
+++ b/intern.h
@@ -204,7 +204,6 @@ int rb_thread_alone _((void));
 void rb_thread_polling _((void));
 void rb_thread_sleep _((int));
 void rb_thread_sleep_forever _((void));
-enum rb_thread_status rb_thread_status _((VALUE));
 VALUE rb_thread_stop _((void));
 VALUE rb_thread_wakeup _((VALUE));
 VALUE rb_thread_wakeup_alive _((VALUE));
diff --git a/version.h b/version.h
index 41b90684f7..b4420242ee 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2007-06-15"
+#define RUBY_RELEASE_DATE "2007-06-18"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20070615
+#define RUBY_RELEASE_CODE 20070618
 #define RUBY_PATCHLEVEL 38
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2007
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 15
+#define RUBY_RELEASE_DAY 18
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];