3 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f472a11522..5d06aedb17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct 22 17:27:21 2009  Nobuyoshi Nakada  <[email protected]>
+
+	* intern.h (rb_thread_join): added prototype.  a patch from
+	  Mikhail T. in [ruby-core:26217].
+
 Wed Oct 21 01:19:56 2009  NAKAMURA, Hiroshi  <[email protected]>
 
 	* lib/monitor.rb (MonitorMixin.mon_release): ensure the scheduled
diff --git a/ext/thread/thread.c b/ext/thread/thread.c
index ca385ce02e..c4046aa7c5 100644
--- a/ext/thread/thread.c
+++ b/ext/thread/thread.c
@@ -252,7 +252,6 @@ wake_all(List *list)
     return Qnil;
 }
 
-extern int rb_thread_join _((VALUE thread, double limit));
 #define DELAY_INFTY 1E30
 
 static VALUE
diff --git a/intern.h b/intern.h
index 96be3e06a1..d9b8ac0016 100644
--- a/intern.h
+++ b/intern.h
@@ -226,6 +226,7 @@ VALUE rb_thread_kill _((VALUE));
 VALUE rb_thread_alive_p _((VALUE));
 VALUE rb_thread_create _((VALUE (*)(ANYARGS), void*));
 void rb_thread_interrupt _((void));
+int rb_thread_join _((VALUE thread, double limit));
 void rb_thread_trap_eval _((VALUE, int, int));
 void rb_thread_signal_raise _((int));
 void rb_thread_signal_exit _((void));