diff options
| author | Christopher Faylor <me@cgf.cx> | 2011-12-16 09:27:15 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2011-12-16 09:27:15 +0400 |
| commit | 08e4b6acb7c26e77fd1b52b063838459207d1708 (patch) | |
| tree | 3642704eb095f8264deb093957ece77a7678e39d /winsup/cygwin/sigproc.h | |
| parent | e553b822e2eacd12285f30fd89b5738e7f4dbb20 (diff) | |
* exceptions.cc (_cygtls::call_signal_handler): Fix debugging to not go to
console.
* fhandler.cc (fhandler_base_overlapped::wait_overlapped): Add temporary kludge
to work around problem of make closing a handler while it is being read.
* gendef (sigdelayed): Don't call a function if sig has been cleared.
* sigproc.h (cygwait): Simplify slightly.
Diffstat (limited to 'winsup/cygwin/sigproc.h')
| -rw-r--r-- | winsup/cygwin/sigproc.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/winsup/cygwin/sigproc.h b/winsup/cygwin/sigproc.h index f5547154d..a9678376e 100644 --- a/winsup/cygwin/sigproc.h +++ b/winsup/cygwin/sigproc.h @@ -87,14 +87,11 @@ cygwait (HANDLE h, DWORD howlong = INFINITE) HANDLE w4[3]; DWORD n = 0; DWORD wait_signal; - if ((w4[n] = h) == NULL) + if ((w4[n] = h) != NULL) + wait_signal = WAIT_OBJECT_0 + ++n; + else wait_signal = WAIT_OBJECT_0 + 15; /* Arbitrary. Don't call signal handler if only waiting for signal */ - else - { - n++; - wait_signal = n; - } w4[n++] = signal_arrived; if ((w4[n] = pthread::get_cancel_event ()) != NULL) n++; |