diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-15 05:33:45 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-15 05:33:45 +0000 |
| commit | f15d0deaaf1ae0b92c539bd823dd2b00afbaf502 (patch) | |
| tree | b127e79147cbb4dbd25369a9ec0d6eb1f10ff52c /include | |
| parent | e56f2abe4b775dcee4690ef43cbac71bbce2a5af (diff) | |
| download | ruby-f15d0deaaf1ae0b92c539bd823dd2b00afbaf502.tar.gz | |
* win32/win32.c, include/ruby/win32.h (rb_w32_io_cancelable_p): renamed
from rb_w32_has_cancel_io(). now it takes a parameter as fd to check
the fd is console or not, because we cannot cancel console input even
if we have cancel_io function.
* io.c (WAIT_FD_IN_WIN32): call above function instead of the old one,
so now we can kill the thread which calls STDIN.gets.
the problem was reported by ko1 vir IRC.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32549 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include')
| -rw-r--r-- | include/ruby/win32.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/ruby/win32.h b/include/ruby/win32.h index 4d8a66742f..bb6d2017a1 100644 --- a/include/ruby/win32.h +++ b/include/ruby/win32.h @@ -234,7 +234,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_io_cancelable_p(int); 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); |