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 /win32 | |
| 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 'win32')
| -rw-r--r-- | win32/win32.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/win32/win32.c b/win32/win32.c index 5b05510209..fa49cf17de 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -548,6 +548,12 @@ init_env(void) typedef BOOL (WINAPI *cancel_io_t)(HANDLE); static cancel_io_t cancel_io = NULL; +int +rb_w32_has_cancel_io(void) +{ + return cancel_io != NULL; +} + static void init_func(void) { |