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 | 7aae3bd3c37b3f399aa55325a37c8428e5981e2d (patch) | |
| tree | 6b7bef785c557d7cc4852dbaafc70e0e44c04c42 /win32/win32.c | |
| parent | b3f0ef089710b27e2b22921f732190f0e05e11b2 (diff) | |
| download | ruby-7aae3bd3c37b3f399aa55325a37c8428e5981e2d.tar.gz ruby-7aae3bd3c37b3f399aa55325a37c8428e5981e2d.tar.xz ruby-7aae3bd3c37b3f399aa55325a37c8428e5981e2d.zip | |
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
Diffstat (limited to 'win32/win32.c')
| -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 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; \ |