From 458ef71dbf91ad2eb6c102a18bbc010c9038829f Mon Sep 17 00:00:00 2001 From: kosaki Date: Tue, 30 Aug 2011 20:29:08 +0000 Subject: merge revision(s) 33133: * win32/win32.c (rb_w32_select_with_thread): and my typo. we all must be more careful. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33138 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ win32/win32.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 98bc1eb344..2c52a728da 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Aug 31 05:29:03 2011 NAKAMURA Usaku + + * 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 * thread.c (rb_thread_select): critical typo in r33117. diff --git a/win32/win32.c b/win32/win32.c index 5e4ea6db4e..26ac2721fe 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -2706,7 +2706,7 @@ rb_w32_select_with_thread(int nfds, fd_set *rd, fd_set *wr, fd_set *ex, 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; -- cgit v1.2.3