diff options
Diffstat (limited to 'ACE/ace/os_include/os_signal.h')
| -rw-r--r-- | ACE/ace/os_include/os_signal.h | 59 |
1 files changed, 9 insertions, 50 deletions
diff --git a/ACE/ace/os_include/os_signal.h b/ACE/ace/os_include/os_signal.h index acda29454d7..9d22f610cf5 100644 --- a/ACE/ace/os_include/os_signal.h +++ b/ACE/ace/os_include/os_signal.h @@ -32,43 +32,25 @@ } #endif /* !ACE_LACKS_SIGNAL_H */ -// This must come after signal.h is #included. -#if defined (SCO) -# define SIGIO SIGPOLL -# include /**/ <sys/regset.h> -#endif /* SCO */ - #if defined (ACE_HAS_SIGINFO_T) # if !defined (ACE_LACKS_SIGINFO_H) -# if defined (__QNX__) || defined (__OpenBSD__) || defined (__INTERIX) +# if defined (ACE_HAS_SYS_SIGINFO_H) # include /**/ <sys/siginfo.h> -# else /* __QNX__ || __OpenBSD__ */ +# else /* ACE_HAS_SYS_SIGINFO_H */ # include /**/ <siginfo.h> -# endif /* __QNX__ || __OpenBSD__ */ +# endif /* ACE_HAS_SYS_SIGINFO_H */ # endif /* ACE_LACKS_SIGINFO_H */ #endif /* ACE_HAS_SIGINFO_T */ -#if defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x620) && !defined (__RTP__) -# include /**/ <sigLib.h> -#endif /* ACE_VXWORKS */ - // Place all additions (especially function declarations) within extern "C" {} #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ -#if defined (ACE_LACKS_SIGSET) +#if defined (ACE_LACKS_SIGSET) && !defined (__MINGW32__) typedef u_int sigset_t; -#endif /* ACE_LACKS_SIGSET */ - -#if defined (ACE_HAS_SIG_MACROS) -# undef sigemptyset -# undef sigfillset -# undef sigaddset -# undef sigdelset -# undef sigismember -#endif /* ACE_HAS_SIG_MACROS */ +#endif /* ACE_LACKS_SIGSET && !sigset_t */ #if !defined (ACE_HAS_SIG_ATOMIC_T) typedef int sig_atomic_t; @@ -163,17 +145,17 @@ extern "C" // All other platforms set NSIG to one greater than the // highest-numbered signal. # define ACE_NSIG NSIG -#endif /* __Lynx__ */ +#endif /* ACE_VXWORKS */ #if defined (ACE_HAS_WINCE) typedef void (__cdecl * __sighandler_t)(int); #endif -#if defined (ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES) || defined (ACE_HAS_LYNXOS50_SIGNALS) - // Prototypes for both signal() and struct sigaction are consistent.. +#if defined (ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES) + // Prototypes for both signal() and struct sigaction are consistent.. typedef void (*ACE_SignalHandler)(int); typedef void (*ACE_SignalHandlerV)(int); -#elif defined (ACE_HAS_LYNXOS_SIGNALS) || defined (ACE_HAS_TANDEM_SIGNALS) +#elif defined (ACE_HAS_LYNXOS4_SIGNALS) || defined (ACE_HAS_TANDEM_SIGNALS) typedef void (*ACE_SignalHandler)(...); typedef void (*ACE_SignalHandlerV)(...); #elif defined (ACE_HAS_SVR4_SIGNAL_T) @@ -183,9 +165,6 @@ extern "C" #elif defined (ACE_WIN32) typedef void (__cdecl *ACE_SignalHandler)(int); typedef void (__cdecl *ACE_SignalHandlerV)(int); -#elif defined (ACE_HAS_UNIXWARE_SVR4_SIGNAL_T) - typedef void (*ACE_SignalHandler)(int); - typedef void (*ACE_SignalHandlerV)(...); #elif defined (INTEGRITY) typedef void (*ACE_SignalHandler)(); typedef void (*ACE_SignalHandlerV)(int); @@ -223,26 +202,6 @@ extern "C" # endif /* ACE_SIGRTMAX */ #endif /* ACE_HAS_POSIX_REALTIME_SIGNALS */ -#if defined (DIGITAL_UNIX) - // sigwait is yet another macro on Digital UNIX 4.0, just causing - // trouble when introducing member functions with the same name. - // Thanks to Thilo Kielmann" <kielmann@informatik.uni-siegen.de> for - // this fix. -# if defined (__DECCXX_VER) -# undef sigwait - // cxx on Digital Unix 4.0 needs this declaration. With it, - // <::_Psigwait> works with cxx -pthread. g++ does _not_ need - // it. - int _Psigwait __((const sigset_t *set, int *sig)); -# endif /* __DECCXX_VER */ -#elif !defined (ACE_HAS_SIGWAIT) -# if defined(ACE_HAS_RTEMS) - int sigwait (const sigset_t *set, int *sig); -# else - int sigwait (sigset_t *set); -# endif /* ACE_HAS_RTEMS */ -#endif /* ! DIGITAL_UNIX && ! ACE_HAS_SIGWAIT */ - #if !defined (ACE_HAS_PTHREAD_SIGMASK_PROTOTYPE) int pthread_sigmask(int, const sigset_t *, sigset_t *); #endif /*!ACE_HAS_PTHREAD_SIGMASK_PROTOTYPE */ |