From 75d423d5b4ce43a9586504b37a6af91bcb5d37ac Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 24 Feb 2021 16:09:14 +0100 Subject: Removed checks for ACE_HAS_TANDEM_SIGNALS, not set in any config file * ACE/ace/OS_NS_signal.inl: * ACE/ace/Signal.cpp: * ACE/ace/Signal.inl: * ACE/ace/os_include/os_signal.h: --- ACE/ace/OS_NS_signal.inl | 4 ---- ACE/ace/Signal.cpp | 27 --------------------------- ACE/ace/Signal.inl | 4 ---- ACE/ace/os_include/os_signal.h | 3 --- 4 files changed, 38 deletions(-) (limited to 'ACE') diff --git a/ACE/ace/OS_NS_signal.inl b/ACE/ace/OS_NS_signal.inl index b9b3616d84f..1f74021742d 100644 --- a/ACE/ace/OS_NS_signal.inl +++ b/ACE/ace/OS_NS_signal.inl @@ -201,11 +201,7 @@ signal (int signum, ACE_SignalHandler func) else #if (defined ACE_WIN32 && !defined ACE_HAS_WINCE) || \ (!defined ACE_LACKS_UNIX_SIGNALS && !defined ACE_LACKS_SIGNAL) -# if !defined (ACE_HAS_TANDEM_SIGNALS) return ::signal (signum, func); -# else - return (ACE_SignalHandler) ::signal (signum, (void (*)(int)) func); -# endif /* !ACE_HAS_TANDEM_SIGNALS */ #else // @@ WINCE: Don't know how to implement signal on WinCE (yet.) ACE_UNUSED_ARG (signum); diff --git a/ACE/ace/Signal.cpp b/ACE/ace/Signal.cpp index 2c285661a0b..0867edbe20e 100644 --- a/ACE/ace/Signal.cpp +++ b/ACE/ace/Signal.cpp @@ -102,11 +102,7 @@ ACE_Sig_Action::ACE_Sig_Action (ACE_SignalHandler sig_handler, else this->sa_.sa_mask = *sig_mask; // Structure assignment... -#if !defined(ACE_HAS_TANDEM_SIGNALS) this->sa_.sa_handler = ACE_SignalHandlerV (sig_handler); -#else - this->sa_.sa_handler = (void (*)()) ACE_SignalHandlerV (sig_handler); -#endif /* !ACE_HAS_TANDEM_SIGNALS */ } ACE_Sig_Action::ACE_Sig_Action (ACE_SignalHandler sig_handler, @@ -118,12 +114,7 @@ ACE_Sig_Action::ACE_Sig_Action (ACE_SignalHandler sig_handler, // Structure assignment... this->sa_.sa_mask = sig_mask.sigset (); - -#if !defined(ACE_HAS_TANDEM_SIGNALS) this->sa_.sa_handler = ACE_SignalHandlerV (sig_handler); -#else - this->sa_.sa_handler = (void (*)()) ACE_SignalHandlerV (sig_handler); -#endif /* !ACE_HAS_TANDEM_SIGNALS */ } ACE_Sig_Action::ACE_Sig_Action (ACE_SignalHandler sig_handler, @@ -139,11 +130,7 @@ ACE_Sig_Action::ACE_Sig_Action (ACE_SignalHandler sig_handler, else this->sa_.sa_mask = *sig_mask; // Structure assignment... -#if !defined(ACE_HAS_TANDEM_SIGNALS) this->sa_.sa_handler = ACE_SignalHandlerV (sig_handler); -#else - this->sa_.sa_handler = (void (*)()) ACE_SignalHandlerV (sig_handler); -#endif /* !ACE_HAS_TANDEM_SIGNALS */ ACE_OS::sigaction (signum, &this->sa_, 0); } @@ -157,12 +144,7 @@ ACE_Sig_Action::ACE_Sig_Action (ACE_SignalHandler sig_handler, // Structure assignment... this->sa_.sa_mask = sig_mask.sigset (); - -#if !defined(ACE_HAS_TANDEM_SIGNALS) this->sa_.sa_handler = ACE_SignalHandlerV (sig_handler); -#else - this->sa_.sa_handler = (void (*)()) ACE_SignalHandlerV (sig_handler); -#endif /* !ACE_HAS_TANDEM_SIGNALS */ ACE_OS::sigaction (signum, &this->sa_, 0); } @@ -176,12 +158,7 @@ ACE_Sig_Action::ACE_Sig_Action (const ACE_Sig_Set &signals, // Structure assignment... this->sa_.sa_mask = sig_mask.sigset (); - -#if !defined(ACE_HAS_TANDEM_SIGNALS) this->sa_.sa_handler = ACE_SignalHandlerV (sig_handler); -#else - this->sa_.sa_handler = (void (*)()) ACE_SignalHandlerV (sig_handler); -#endif /* !ACE_HAS_TANDEM_SIGNALS */ #if (ACE_NSIG > 0) for (int s = 1; s < ACE_NSIG; s++) @@ -205,11 +182,7 @@ ACE_Sig_Action::ACE_Sig_Action (const ACE_Sig_Set &signals, else this->sa_.sa_mask = *sig_mask; // Structure assignment... -#if !defined(ACE_HAS_TANDEM_SIGNALS) this->sa_.sa_handler = ACE_SignalHandlerV (sig_handler); -#else - this->sa_.sa_handler = (void (*)()) ACE_SignalHandlerV (sig_handler); -#endif /* !ACE_HAS_TANDEM_SIGNALS */ #if (ACE_NSIG > 0) for (int s = 1; s < ACE_NSIG; s++) diff --git a/ACE/ace/Signal.inl b/ACE/ace/Signal.inl index 11fb1550967..55882f85b9f 100644 --- a/ACE/ace/Signal.inl +++ b/ACE/ace/Signal.inl @@ -140,11 +140,7 @@ ACE_INLINE void ACE_Sig_Action::handler (ACE_SignalHandler handler) { ACE_TRACE ("ACE_Sig_Action::handler"); -#if !defined(ACE_HAS_TANDEM_SIGNALS) this->sa_.sa_handler = ACE_SignalHandlerV (handler); -#else - this->sa_.sa_handler = (void (*)()) ACE_SignalHandlerV (handler); -#endif /* !ACE_HAS_TANDEM_SIGNALS */ } ACE_INLINE void diff --git a/ACE/ace/os_include/os_signal.h b/ACE/ace/os_include/os_signal.h index 9b5de3b8ce1..32161dfaf70 100644 --- a/ACE/ace/os_include/os_signal.h +++ b/ACE/ace/os_include/os_signal.h @@ -153,9 +153,6 @@ extern "C" // Prototypes for both signal() and struct sigaction are consistent.. typedef void (*ACE_SignalHandler)(int); typedef void (*ACE_SignalHandlerV)(int); -#elif defined (ACE_HAS_TANDEM_SIGNALS) - typedef void (*ACE_SignalHandler)(...); - typedef void (*ACE_SignalHandlerV)(...); #elif defined (ACE_HAS_SVR4_SIGNAL_T) // SVR4 Signals are inconsistent (e.g., see struct sigaction).. typedef void (*ACE_SignalHandler)(int); -- cgit v1.2.1