mame	2010-08-04 19:27:07 +0900 (Wed, 04 Aug 2010)

  New Revision: 28855

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28855

  Log:
    merges r28834 from trunk into ruby_1_9_2.
    --
    * thread_win32.c (native_thread_join): need to wait thread, of course.
      [ruby-dev:41911]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/thread_win32.c

Index: ruby_1_9_2/thread_win32.c
===================================================================
--- ruby_1_9_2/thread_win32.c	(revision 28854)
+++ ruby_1_9_2/thread_win32.c	(revision 28855)
@@ -507,7 +507,7 @@
 static void
 native_thread_join(HANDLE th)
 {
-    w32_wait_events(&th, 1, 0, 0);
+    w32_wait_events(&th, 1, INFINITE, 0);
 }
 
 #if USE_NATIVE_THREAD_PRIORITY
Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 28854)
+++ ruby_1_9_2/ChangeLog	(revision 28855)
@@ -1,3 +1,8 @@
+Mon Aug  2 16:34:32 2010  NAKAMURA Usaku  <usa@r...>
+
+	* thread_win32.c (native_thread_join): need to wait thread, of course.
+	  [ruby-dev:41911]
+
 Mon Aug  2 12:22:22 2010  NAKAMURA Usaku  <usa@r...>
 
 	* file.c (file_expand_path): wrong condition. [ruby-core:31591]

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/