diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-11 05:09:59 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-11 05:09:59 +0000 |
commit | 52583c34d1d16ecb33d3d3425dd1d56bebc22e18 (patch) | |
tree | efaeff3c9375c6b5e4bb08f00acfa0145b69ddd0 /include | |
parent | 5b2c631d31db17777e8c1e5b071131ed255f927e (diff) |
merge from trunk (r27718)
* win32/win32.c, include/ruby/win32.h (rb_w32_has_cancel_io): new
function.
* io.c (WAIT_FD_IN_WIN32): check only when it's not cancelable.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@27732 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include')
-rw-r--r-- | include/ruby/win32.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/ruby/win32.h b/include/ruby/win32.h index d75c7ea9d3..47a85270a5 100644 --- a/include/ruby/win32.h +++ b/include/ruby/win32.h @@ -222,6 +222,7 @@ struct msghdr { extern int rb_w32_cmdvector(const char *, char ***); extern rb_pid_t rb_w32_pipe_exec(const char *, const char *, int, int *, int *); extern int flock(int fd, int oper); +extern int rb_w32_has_cancel_io(void); extern int rb_w32_is_socket(int); extern int WSAAPI rb_w32_accept(int, struct sockaddr *, int *); extern int WSAAPI rb_w32_bind(int, const struct sockaddr *, int); |