diff options
author | Christopher Faylor <me@cgf.cx> | 2012-06-19 04:52:59 +0400 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2012-06-19 04:52:59 +0400 |
commit | 978441cc0ea58a2f3fd5d84f1d0f50bc8307b34a (patch) | |
tree | 3afb58a7fcc101fd407582a1c38b020526797e1e /winsup/cygwin/wait.cc | |
parent | 2addde8cb1e794a9818b9417839524dbc05401da (diff) |
* cygwait.h (LARGE_NULL): Define.
(cancelable_wait): Define variant which accepts DWORD time argument.
(cygwait): Use cancelable_wait with DWORD argument.
(cygwait): Use cancelable_wait with DWORD argument and cw_sig_eintr for
timeout-only case.
* exceptions.cc (handle_sigsuspend): Use LARGE_NULL as second argument to
distinguish between cancelable_wait variants.
* thread.cc (pthread_mutex::lock): Ditto.
(pthread::join): Ditto.
(semaphore::_timedwait): Ditto.
* thread.h (fast_mutex::lock): Ditto.
* wait.cc (wait4): Ditto.
Diffstat (limited to 'winsup/cygwin/wait.cc')
-rw-r--r-- | winsup/cygwin/wait.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/winsup/cygwin/wait.cc b/winsup/cygwin/wait.cc index 829c123bd..714a9e26e 100644 --- a/winsup/cygwin/wait.cc +++ b/winsup/cygwin/wait.cc @@ -80,7 +80,7 @@ wait4 (int intpid, int *status, int options, struct rusage *r) if ((waitfor = w->ev) == NULL) goto nochildren; - res = cancelable_wait (waitfor, NULL, cw_cancel | cw_cancel_self); + res = cancelable_wait (waitfor, LARGE_NULL, cw_cancel | cw_cancel_self); sigproc_printf ("%d = cancelable_wait (...)", res); |