summaryrefslogtreecommitdiffstats
path: root/win32
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-09-28 10:37:41 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-09-28 10:37:41 +0000
commit61a42dca99e72f06b1718433754536f3affccd51 (patch)
treeb8f4afbfa9159026426fad36f1099364b9516ef0 /win32
parent5f7ee3083f0ddb6616d6d56c18478344fcc2803a (diff)
downloadruby-61a42dca99e72f06b1718433754536f3affccd51.tar.gz
ruby-61a42dca99e72f06b1718433754536f3affccd51.tar.xz
ruby-61a42dca99e72f06b1718433754536f3affccd51.zip
* 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/trunk@25133 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
-rw-r--r--win32/win32.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/win32/win32.c b/win32/win32.c
index 353873a22..222af78c7 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -253,7 +253,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; \