1 files changed, 2 insertions, 5 deletions
diff --git a/winsup/cygwin/cygwait.h b/winsup/cygwin/cygwait.h
index d52a145ae..0303ec3b6 100644
--- a/winsup/cygwin/cygwait.h
+++ b/winsup/cygwin/cygwait.h
@@ -22,10 +22,7 @@ enum cw_wait_mask
   cw_sig_eintr =	0x0008
 };
 
-extern LARGE_INTEGER cw_nowait_storage;
-#define cw_nowait (&cw_nowait_storage)
-#define cw_infinite ((PLARGE_INTEGER) NULL)
-
+#define LARGE_NULL ((PLARGE_INTEGER) NULL)
 const unsigned cw_std_mask = cw_cancel | cw_cancel_self | cw_sig;
 
 DWORD cancelable_wait (HANDLE, PLARGE_INTEGER timeout = NULL,
@@ -56,5 +53,5 @@ cygwait (HANDLE h, DWORD howlong = INFINITE)
 static inline DWORD __attribute__ ((always_inline))
 cygwait (DWORD howlong)
 {
-  return cygwait (NULL, howlong);
+  return cancelable_wait (NULL, howlong, cw_cancel | cw_sig_eintr);
 }