* 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/trunk@25133 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
lann · Sep 28, 2009 · 51cefa3 · 51cefa3
1 parent 9d7e471
commit 51cefa3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Sep 28 19:36:20 2009  NAKAMURA Usaku  <[email protected]>
+
+	* win32/wini32.c (LK_ERR): with overlapped I/O, LockFileEx() returns
+	  ERROR_IO_PENDING if the file is locked.
+
 Mon Sep 28 19:05:05 2009  Martin Duerst  <[email protected]>
 
 	* include/ruby/st.h: aligned prototype of st_hash_uint32 with function

diff --git 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;							\