diff options
| author | Christopher Faylor <me@cgf.cx> | 2012-06-19 04:31:15 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2012-06-19 04:31:15 +0400 |
| commit | af5cd145835d35519af02d0d226f67eb777e4945 (patch) | |
| tree | d31ebb964550d4e73c3f0d63d3fa0d1b502e44f4 /winsup/cygwin/flock.cc | |
| parent | 88fbcb5afd6d7d687387b22509037d99e2aa07ff (diff) | |
* cygwait.cc (cancelable_wait): Mimic old cygwait behavior more closely wrt
handling of call_signal_handler.
* cygwait.h (WAIT_CANCELED): Move here and redefine.
(WAIT_SIGNALED): Ditto.
* thread.h (WAIT_CANCELED): Delete.
(WAIT_SIGNALED): Ditto.
Diffstat (limited to 'winsup/cygwin/flock.cc')
| -rw-r--r-- | winsup/cygwin/flock.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/winsup/cygwin/flock.cc b/winsup/cygwin/flock.cc index 176e4869e..f40c1e5c6 100644 --- a/winsup/cygwin/flock.cc +++ b/winsup/cygwin/flock.cc @@ -1247,7 +1247,7 @@ lf_setlock (lockf_t *lock, inode_t *node, lockf_t **clean, HANDLE fhdl) timeout = 100L; DWORD WAIT_SIGNAL_ARRIVED = WAIT_OBJECT_0 + wait_count; - w4[wait_count++] = signal_arrived; + set_thread_waiting (w4[wait_count++]); DWORD WAIT_THREAD_CANCELED = WAIT_TIMEOUT + 1; HANDLE cancel_event = pthread::get_cancel_event (); |