diff options
| author | Christopher Faylor <me@cgf.cx> | 2012-06-19 00:31:15 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2012-06-19 00:31:15 +0000 |
| commit | af5cd145835d35519af02d0d226f67eb777e4945 (patch) | |
| tree | d31ebb964550d4e73c3f0d63d3fa0d1b502e44f4 /winsup/cygwin/fhandler_windows.cc | |
| parent | 88fbcb5afd6d7d687387b22509037d99e2aa07ff (diff) | |
| download | cygnal-af5cd145835d35519af02d0d226f67eb777e4945.tar.gz cygnal-af5cd145835d35519af02d0d226f67eb777e4945.tar.bz2 cygnal-af5cd145835d35519af02d0d226f67eb777e4945.zip | |
* 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/fhandler_windows.cc')
| -rw-r--r-- | winsup/cygwin/fhandler_windows.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/winsup/cygwin/fhandler_windows.cc b/winsup/cygwin/fhandler_windows.cc index c89d98e16..b592e3217 100644 --- a/winsup/cygwin/fhandler_windows.cc +++ b/winsup/cygwin/fhandler_windows.cc @@ -96,7 +96,8 @@ fhandler_windows::read (void *buf, size_t& len) return; } - HANDLE w4[3] = { get_handle (), signal_arrived, NULL }; + HANDLE w4[3] = { get_handle (), }; + set_thread_waiting (w4[1]); DWORD cnt = 2; if ((w4[cnt] = pthread::get_cancel_event ()) != NULL) ++cnt; |