diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-02 03:59:50 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-02 03:59:50 +0000 |
| commit | dbe75ed4bcd326e8c0aab6a6738f9311e49cd72e (patch) | |
| tree | aa4d10621309553f6d8cb9e2ee5c7766c9535099 /win32 | |
| parent | 3108dc4b38c05264e7ce3b117b6c00894b76b9fc (diff) | |
merge revision(s) 37743: [Backport #7379]
* win32/win32.c (rb_w32_read): Windows 8 fixed one of a bug of console
API.
based on the patch by Heesob Park at [ruby-core:49479] [Bug #7379]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@40051 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/win32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/win32/win32.c b/win32/win32.c index fcefe2c6c7..c35e5462f8 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -5216,7 +5216,7 @@ rb_w32_read(int fd, void *buf, size_t size) } ret = 0; - isconsole = is_console(_osfhnd(fd)); + isconsole = is_console(_osfhnd(fd)) && (osver.dwMajorVersion < 6 || (osver.dwMajorVersion == 6 && osver.dwMinorVersion < 2)); if (isconsole) { DWORD mode; GetConsoleMode((HANDLE)_osfhnd(fd),&mode); |