1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* win32/win32.c (flock_winnt, flock_win95): unlock file even if

LOCK_NB is specified.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7827 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2005-01-26 01:51:06 +00:00
parent 4116b8b0f5
commit 66d39f93b4
2 changed files with 7 additions and 0 deletions

View file

@ -1,3 +1,8 @@
Wed Jan 26 10:45:19 2005 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (flock_winnt, flock_win95): unlock file even if
LOCK_NB is specified.
Tue Jan 25 23:10:48 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk: merge tcltklib for Ruby/Tk installation control

View file

@ -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: