diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-28 08:58:21 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-28 08:58:21 +0000 |
| commit | 1d15cf4bebc379a0f70306ae165680ffe4a12d87 (patch) | |
| tree | f4f94ea85a9bdc7017c191bde12ef6b1ba954bde /ChangeLog | |
| parent | f52f03394d9f439a6ecceca9d63804082a0f3a42 (diff) | |
merge revision(s) 32549,32557: [Backport #6661]
* 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.
* win32/win32.c (is_socket, is_console): add prototypes to fix compile
problem with gcc introduced at r32549.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@36244 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Thu Jun 28 17:57:49 2012 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/win32.c (is_socket, is_console): add prototypes to fix compile + problem with gcc introduced at r32549. + Wed Jun 27 08:31:50 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> * insns.def (splatarray): make new array if flag is set. |