From 4510afa90d42eec08a2ec91f4203ed126ab998c8 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Sun, 4 Dec 2011 18:15:36 +0000 Subject: [PATCH] * sigproc.h (cygWFMO): Move inside "INSIDE_CYGWIN" #ifdef. --- winsup/cygwin/ChangeLog | 4 ++++ winsup/cygwin/sigproc.h | 30 +++++++++++++++--------------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index ba23ea6d0..c18f292dc 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,7 @@ +2011-12-04 Christopher Faylor + + * sigproc.h (cygWFMO): Move inside "INSIDE_CYGWIN" #ifdef. + 2011-12-04 Christopher Faylor * exceptions.cc (exception::handle): Drop abbreviation for "exception" diff --git a/winsup/cygwin/sigproc.h b/winsup/cygwin/sigproc.h index 086466b6f..2c027a9e4 100644 --- a/winsup/cygwin/sigproc.h +++ b/winsup/cygwin/sigproc.h @@ -59,21 +59,6 @@ struct sigpacket }; extern HANDLE signal_arrived; - -static inline -DWORD cygWFMO (DWORD n, DWORD howlong, ...) -{ - va_list ap; - va_start (ap, howlong); - HANDLE w4[n + 2]; - va_start (ap, howlong); - unsigned i; - for (i = 0; i < n; i++) - w4[i] = va_arg (ap, HANDLE); - w4[i++] = signal_arrived; - w4[i++] = pthread::get_cancel_event (); - return WaitForMultipleObjects (n, w4, FALSE, howlong); -} extern HANDLE sigCONT; void __stdcall sig_dispatch_pending (bool fast = false); @@ -95,6 +80,21 @@ void __stdcall proc_terminate (); void __stdcall sigproc_init (); #ifdef __INSIDE_CYGWIN__ void __stdcall sigproc_terminate (enum exit_states); + +static inline +DWORD cygWFMO (DWORD n, DWORD howlong, ...) +{ + va_list ap; + va_start (ap, howlong); + HANDLE w4[n + 2]; + va_start (ap, howlong); + unsigned i; + for (i = 0; i < n; i++) + w4[i] = va_arg (ap, HANDLE); + w4[i++] = signal_arrived; + w4[i++] = pthread::get_cancel_event (); + return WaitForMultipleObjects (n, w4, FALSE, howlong); +} #endif bool __stdcall pid_exists (pid_t) __attribute__ ((regparm(1))); int __stdcall sig_send (_pinfo *, siginfo_t&, class _cygtls *tls = NULL) __attribute__ ((regparm (3)));