JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* sigproc.h (cygWFMO): Move inside "INSIDE_CYGWIN" #ifdef.

Browse Source
This commit is contained in:
Christopher Faylor
2011-12-04 18:15:36 +00:00
parent 8f937028d9
commit 4510afa90d
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
winsup/cygwin/ChangeLog
View File

@@ -1,3 +1,7 @@
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> 2011-12-04 Christopher Faylor <me.cygwin2011@cgf.cx>
* exceptions.cc (exception::handle): Drop abbreviation for "exception" * exceptions.cc (exception::handle): Drop abbreviation for "exception"

30
winsup/cygwin/sigproc.h
View File

@@ -59,21 +59,6 @@ struct sigpacket
}; };
extern HANDLE signal_arrived; 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; extern HANDLE sigCONT;
void __stdcall sig_dispatch_pending (bool fast = false); void __stdcall sig_dispatch_pending (bool fast = false);
@@ -95,6 +80,21 @@ void __stdcall proc_terminate ();
void __stdcall sigproc_init (); void __stdcall sigproc_init ();
#ifdef __INSIDE_CYGWIN__ #ifdef __INSIDE_CYGWIN__
void __stdcall sigproc_terminate (enum exit_states); 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 #endif
bool __stdcall pid_exists (pid_t) __attribute__ ((regparm(1))); bool __stdcall pid_exists (pid_t) __attribute__ ((regparm(1)));
int __stdcall sig_send (_pinfo *, siginfo_t&, class _cygtls *tls = NULL) __attribute__ ((regparm (3))); int __stdcall sig_send (_pinfo *, siginfo_t&, class _cygtls *tls = NULL) __attribute__ ((regparm (3)));