diff options
| -rw-r--r-- | ChangeLog-99b | 3 | ||||
| -rw-r--r-- | ace/Select_Reactor_T.cpp | 12 | ||||
| -rw-r--r-- | ace/Signal.cpp | 12 |
3 files changed, 13 insertions, 14 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b index f6662cd55e9..9edabe8d934 100644 --- a/ChangeLog-99b +++ b/ChangeLog-99b @@ -2,8 +2,7 @@ Mon Oct 11 12:05:31 1999 Wei Chiang <wei.chiang@nokia.com> * ace/Signal.cpp (ACE_Sig_Action ctors), ace/Select_Reactor_T.cpp (register_handler,remove_handler): - disabled signal-related operations for platforms that - #define ACE_LACKS_UNIX_SIGNALS, including Chorus. + disabled signal-related operations on Chorus. Mon Oct 11 10:15:28 1999 David L. Levine <levine@cs.wustl.edu> diff --git a/ace/Select_Reactor_T.cpp b/ace/Select_Reactor_T.cpp index 90bdc874d9d..7ab8ee08a29 100644 --- a/ace/Select_Reactor_T.cpp +++ b/ace/Select_Reactor_T.cpp @@ -651,18 +651,18 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::register_handler int result = 0; -#if (ACE_NSIG > 0) && !defined(ACE_LACKS_UNIX_SIGNALS) +#if (ACE_NSIG > 0) && !defined (CHORUS) for (int s = 1; s < ACE_NSIG; s++) if (sigset.is_member (s) && this->signal_handler_->register_handler (s, new_sh, new_disp) == -1) result = -1; -#else /* ACE_NSIG <= 0 || ACE_LACKS_UNIX_SIGNALS */ +#else /* ACE_NSIG <= 0 || CHORUS */ ACE_UNUSED_ARG (sigset); ACE_UNUSED_ARG (new_sh); ACE_UNUSED_ARG (new_disp); -#endif /* ACE_NSIG <= 0 || ACE_LACKS_UNIX_SIGNALS */ +#endif /* ACE_NSIG <= 0 || CHORUS */ return result; } @@ -673,14 +673,14 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::remove_handler ACE_TRACE ("ACE_Select_Reactor_T::remove_handler"); int result = 0; -#if (ACE_NSIG > 0) && !defined(ACE_LACKS_UNIX_SIGNALS) +#if (ACE_NSIG > 0) && !defined (CHORUS) for (int s = 1; s < ACE_NSIG; s++) if (sigset.is_member (s) && this->signal_handler_->remove_handler (s) == -1) result = -1; -#else /* ACE_NSIG <= 0 || ACE_LACKS_UNIX_SIGNALS */ +#else /* ACE_NSIG <= 0 || CHORUS */ ACE_UNUSED_ARG (sigset); -#endif /* ACE_NSIG <= 0 || ACE_LACKS_UNIX_SIGNALS */ +#endif /* ACE_NSIG <= 0 || CHORUS */ return result; } diff --git a/ace/Signal.cpp b/ace/Signal.cpp index 654eb492f6c..1b51fd03492 100644 --- a/ace/Signal.cpp +++ b/ace/Signal.cpp @@ -180,14 +180,14 @@ ACE_Sig_Action::ACE_Sig_Action (const ACE_Sig_Set &signals, this->sa_.sa_handler = (void (*)()) ACE_SignalHandlerV (sig_handler); #endif /* !ACE_HAS_TANDEM_SIGNALS */ -#if (ACE_NSIG > 0) && !defined(ACE_LACKS_UNIX_SIGNALS) +#if (ACE_NSIG > 0) && !defined (CHORUS) for (int s = 1; s < ACE_NSIG; s++) if (signals.is_member (s) && ACE_OS::sigaction (s, &this->sa_, 0) == -1) break; -#else /* ACE_NSIG <= 0 || ACE_LACKS_UNIX_SIGNALS */ +#else /* ACE_NSIG <= 0 || CHORUS */ ACE_UNUSED_ARG (signals); -#endif /* ACE_NSIG <= 0 || ACE_LACKS_UNIX_SIGNALS */ +#endif /* ACE_NSIG <= 0 || CHORUS */ } ACE_Sig_Action::ACE_Sig_Action (const ACE_Sig_Set &signals, @@ -209,14 +209,14 @@ ACE_Sig_Action::ACE_Sig_Action (const ACE_Sig_Set &signals, this->sa_.sa_handler = (void (*)()) ACE_SignalHandlerV (sig_handler); #endif /* !ACE_HAS_TANDEM_SIGNALS */ -#if (ACE_NSIG > 0) && !defined(ACE_LACKS_UNIX_SIGNALS) +#if (ACE_NSIG > 0) && !defined (CHORUS) for (int s = 1; s < ACE_NSIG; s++) if (signals.is_member (s) && ACE_OS::sigaction (s, &this->sa_, 0) == -1) break; -#else /* ACE_NSIG <= 0 || ACE_LACKS_UNIX_SIGNALS */ +#else /* ACE_NSIG <= 0 || CHORUS */ ACE_UNUSED_ARG (signals); -#endif /* ACE_NSIG <= 0 || ACE_LACKS_UNIX_SIGNALS */ +#endif /* ACE_NSIG <= 0 || CHORUS */ } ACE_ALLOC_HOOK_DEFINE(ACE_Sig_Handler) |