From 7aae3bd3c37b3f399aa55325a37c8428e5981e2d Mon Sep 17 00:00:00 2001 From: yugui Date: Sat, 5 Dec 2009 09:40:33 +0000 Subject: merges r25133 from trunk into ruby_1_9_1. c.f. [ruby-dev:39819] -- * win32/wini32.c (LK_ERR): with overlapped I/O, LockFileEx() returns ERROR_IO_PENDING if the file is locked. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@26016 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ version.h | 2 +- win32/win32.c | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 16c470434..9d4d6f32b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Sep 28 19:36:20 2009 NAKAMURA Usaku + + * win32/wini32.c (LK_ERR): with overlapped I/O, LockFileEx() returns + ERROR_IO_PENDING if the file is locked. + Mon Nov 23 04:12:00 2009 Tanaka Akira * enc/trans/newline.trans (fun_so_universal_newline): generate \n diff --git a/version.h b/version.h index 163282d7b..e4a3dbcb9 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 369 +#define RUBY_PATCHLEVEL 370 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 diff --git a/win32/win32.c b/win32/win32.c index e10fa8966..0f60dcd7a 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -251,7 +251,7 @@ GetCurrentThreadHandle(void) i = 0; \ else { \ DWORD err = GetLastError(); \ - if (err == ERROR_LOCK_VIOLATION) \ + if (err == ERROR_LOCK_VIOLATION || err == ERROR_IO_PENDING) \ errno = EWOULDBLOCK; \ else if (err == ERROR_NOT_LOCKED) \ i = 0; \ -- cgit