diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-01-26 01:51:06 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-01-26 01:51:06 +0000 |
| commit | f4c838bc0cc333a28a6aa6cad6cfdc5787052c23 (patch) | |
| tree | 0fccd51a4207bee7e24801cc4b0308e9d5ab8f59 /win32 | |
| parent | b5a41473ce9d4033347a987deb4ddac5fc1d575b (diff) | |
| download | ruby-f4c838bc0cc333a28a6aa6cad6cfdc5787052c23.tar.gz ruby-f4c838bc0cc333a28a6aa6cad6cfdc5787052c23.tar.xz ruby-f4c838bc0cc333a28a6aa6cad6cfdc5787052c23.zip | |
* win32/win32.c (flock_winnt, flock_win95): unlock file even if
LOCK_NB is specified.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@7827 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/win32.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/win32/win32.c b/win32/win32.c index e8fea8072..9de71d7a2 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -289,6 +289,7 @@ flock_winnt(VALUE self, int argc, VALUE* argv) 0, LK_LEN, LK_LEN, &o), i); break; case LOCK_UN: /* unlock lock */ + case LOCK_UN|LOCK_NB: /* unlock is always non-blocking, I hope */ LK_ERR(UnlockFileEx(fh, 0, LK_LEN, LK_LEN, &o), i); break; default: /* unknown */ @@ -316,6 +317,7 @@ flock_win95(VALUE self, int argc, VALUE* argv) LK_ERR(LockFile(fh, 0, 0, LK_LEN, LK_LEN), i); break; case LOCK_UN: + case LOCK_UN|LOCK_NB: LK_ERR(UnlockFile(fh, 0, 0, LK_LEN, LK_LEN), i); break; default: |