diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | version.h | 2 | ||||
-rw-r--r-- | win32/win32.c | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Mon Sep 28 19:36:20 2009 NAKAMURA Usaku <usa@ruby-lang.org> + + * 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 <akr@fsij.org> * enc/trans/newline.trans (fun_so_universal_newline): generate \n @@ -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 e10fa89661..0f60dcd7a4 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; \ |