diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-04-09 09:29:45 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-04-09 09:29:45 +0000 |
commit | 14869595501ceb1bb82c8b006cc2e9d0acdec908 (patch) | |
tree | 9bef08e65cfc01ac725204b816856e7b308eed78 /win32 | |
parent | 6df7c0c7214c8f56ac61555a1b4da5abc2f58329 (diff) | |
download | ruby-14869595501ceb1bb82c8b006cc2e9d0acdec908.tar.gz |
* thread.c (do_select): use ubf_select() as UBF on windows.
* win32/win32.c (do_select): shouldn't call catch_interrupt() here.
fixed: [ruby-dev:30674], reported by wanabe.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12159 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
-rw-r--r-- | win32/win32.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/win32/win32.c b/win32/win32.c index 823ced33f1..3c8be568d9 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -2110,9 +2110,6 @@ do_select(int nfds, fd_set *rd, fd_set *wr, fd_set *ex, rb_w32_sleep(INFINITE); } else { -#if !USE_INTERRUPT_WINSOCK - int trap_immediate = rb_trap_immediate; -#endif /* !USE_INTERRUPT_WINSOCK */ RUBY_CRITICAL( r = select(nfds, rd, wr, ex, timeout); if (r == SOCKET_ERROR) { @@ -2120,10 +2117,6 @@ do_select(int nfds, fd_set *rd, fd_set *wr, fd_set *ex, r = -1; } ); -#if !USE_INTERRUPT_WINSOCK - rb_trap_immediate = trap_immediate; - catch_interrupt(); -#endif /* !USE_INTERRUPT_WINSOCK */ } return r; |