diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-10-02 07:48:42 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-10-02 07:48:42 +0000 |
commit | 846ce3e7cec9b173d8d5c4808f84dd75947bb101 (patch) | |
tree | 9e3660449780967673d6a687f00329710e899537 /win32/win32.c | |
parent | 46b28a7b44ea1ecfdb5698f3c500790908f58bc1 (diff) | |
download | ruby-846ce3e7cec9b173d8d5c4808f84dd75947bb101.tar.gz ruby-846ce3e7cec9b173d8d5c4808f84dd75947bb101.tar.xz ruby-846ce3e7cec9b173d8d5c4808f84dd75947bb101.zip |
matz
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@985 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/win32.c')
-rw-r--r-- | win32/win32.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/win32/win32.c b/win32/win32.c index 49b781f67..9142c4d94 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -1904,7 +1904,6 @@ myselect (int nfds, fd_set *rd, fd_set *wr, fd_set *ex, long r; fd_set file_rd; fd_set file_wr; - fd_set trap; int file_nfds; int trap_immediate = rb_trap_immediate; @@ -1925,16 +1924,9 @@ myselect (int nfds, fd_set *rd, fd_set *wr, fd_set *ex, if (wr) *wr = file_wr; return file_nfds; } - if (ex) - trap = *ex; - else - trap.fd_count = 0; - if (trap.fd_count < FD_SETSIZE) - trap.fd_array[trap.fd_count++] = rb_InterruptEvent; - // else unable to catch interrupt. if (trap_immediate) TRAP_END; - if ((r = select (nfds, rd, wr, &trap, timeout)) == SOCKET_ERROR) { + if ((r = select (nfds, rd, wr, ex, timeout)) == SOCKET_ERROR) { errno = WSAGetLastError(); switch (errno) { case WSAEINTR: |