summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-08-30 20:29:08 +0000
committerkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-08-30 20:29:08 +0000
commit458ef71dbf91ad2eb6c102a18bbc010c9038829f (patch)
tree203e6f14d39e55cebdd883a9b15280de91784caa /win32
parente733edd76bf4ca19858187195134908b53e60aab (diff)
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
Diffstat (limited to 'win32')
-rw-r--r--win32/win32.c2
1 files changed, 1 insertions, 1 deletions
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;