diff options
| author | Christopher Faylor <me@cgf.cx> | 2011-12-04 22:15:36 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2011-12-04 22:15:36 +0400 |
| commit | 4510afa90d42eec08a2ec91f4203ed126ab998c8 (patch) | |
| tree | 8e17960bce1bf0676de33f115d967a3ef7e652de /winsup | |
| parent | 8f937028d9b8d387cf35b64d92056241bffabd78 (diff) | |
* sigproc.h (cygWFMO): Move inside "INSIDE_CYGWIN" #ifdef.
Diffstat (limited to 'winsup')
| -rw-r--r-- | winsup/cygwin/ChangeLog | 4 | ||||
| -rw-r--r-- | 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,5 +1,9 @@ 2011-12-04 Christopher Faylor <me.cygwin2011@cgf.cx> + * sigproc.h (cygWFMO): Move inside "INSIDE_CYGWIN" #ifdef. + +2011-12-04 Christopher Faylor <me.cygwin2011@cgf.cx> + * exceptions.cc (exception::handle): Drop abbreviation for "exception" since I never remember what it stands for. (sig_handle_tty_stop): Remove obsolete call to sig_handle_tty_stop. 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))); |