diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-05 09:40:33 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-05 09:40:33 +0000 |
| commit | 9e557661c24d13051b6ef180028cc173433e6b2e (patch) | |
| tree | 6b7bef785c557d7cc4852dbaafc70e0e44c04c42 | |
| parent | e57e5c5b07762dd7983adc87c2a278449423659e (diff) | |
| download | ruby-9e557661c24d13051b6ef180028cc173433e6b2e.tar.gz | |
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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@26016 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -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; \ |