From 978441cc0ea58a2f3fd5d84f1d0f50bc8307b34a Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Tue, 19 Jun 2012 00:52:59 +0000 Subject: * 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. --- winsup/cygwin/wait.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'winsup/cygwin/wait.cc') 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); -- cgit v1.2.3