kosaki	2011-08-31 05:29:08 +0900 (Wed, 31 Aug 2011)

  New Revision: 33138

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

  Log:
    merge revision(s) 33133:
    
    * win32/win32.c (rb_w32_select_with_thread): and my typo. we all must
      be more careful.

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/win32/win32.c

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 33137)
+++ ruby_1_9_3/ChangeLog	(revision 33138)
@@ -1,3 +1,8 @@
+Wed Aug 31 05:29:03 2011  NAKAMURA Usaku  <usa@r...>
+
+	* win32/win32.c (rb_w32_select_with_thread): and my typo. we all must
+	  be more careful.
+
 Wed Aug 31 05:28:45 2011  NAKAMURA Usaku  <usa@r...>
 
 	* thread.c (rb_thread_select): critical typo in r33117.
Index: ruby_1_9_3/win32/win32.c
===================================================================
--- ruby_1_9_3/win32/win32.c	(revision 33137)
+++ ruby_1_9_3/win32/win32.c	(revision 33138)
@@ -2706,7 +2706,7 @@
 	    if (else_rd.fdset->fd_count || else_wr.fdset->fd_count) {
 		r = do_select(nfds, rd, wr, ex, &zero); // polling
 		if (r < 0) break; // XXX: should I ignore error and return signaled handles?
-		r = copy_fd(rd, else_rd.fdset);
+		r += copy_fd(rd, else_rd.fdset);
 		r += copy_fd(wr, else_wr.fdset);
 		if (ex)
 		    r += ex->fd_count;

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