diff options
Diffstat (limited to 'ace/OS_NS_signal.inl')
| -rw-r--r-- | ace/OS_NS_signal.inl | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/ace/OS_NS_signal.inl b/ace/OS_NS_signal.inl index a56956e4aa0..a2159ad2604 100644 --- a/ace/OS_NS_signal.inl +++ b/ace/OS_NS_signal.inl @@ -1,32 +1,28 @@ // -*- C++ -*- -// // $Id$ #include "ace/OS_NS_macros.h" #include "ace/OS_NS_errno.h" -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace ACE_OS -{ +namespace ACE_OS { ACE_INLINE int kill (pid_t pid, int signum) { ACE_OS_TRACE ("ACE_OS::kill"); -#if defined (ACE_LACKS_KILL) +#if defined (ACE_WIN32) || defined (CHORUS) || defined (ACE_PSOS) ACE_UNUSED_ARG (pid); ACE_UNUSED_ARG (signum); ACE_NOTSUP_RETURN (-1); #else ACE_OSCALL_RETURN (::kill (pid, signum), int, -1); -#endif /* ACE_LACKS_KILL */ +#endif /* ACE_WIN32 || CHORUS || ACE_PSOS */ } ACE_INLINE int pthread_sigmask (int how, const sigset_t *nsp, sigset_t *osp) { -#if defined (ACE_HAS_PTHREADS_STD) && !defined (ACE_LACKS_PTHREAD_SIGMASK) +#if defined (ACE_HAS_PTHREADS_STD) && !defined (ACE_LACKS_PTHREAD_SIGMASK) int result; ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_sigmask (how, nsp, osp), result), @@ -41,7 +37,7 @@ pthread_sigmask (int how, const sigset_t *nsp, sigset_t *osp) } ACE_INLINE int -sigaction (int signum, const ACE_SIGACTION *nsa, ACE_SIGACTION *osa) +sigaction (int signum, const struct sigaction *nsa, struct sigaction *osa) { ACE_OS_TRACE ("ACE_OS::sigaction"); if (signum == 0) @@ -60,7 +56,8 @@ sigaction (int signum, const ACE_SIGACTION *nsa, ACE_SIGACTION *osa) else osa->sa_handler = ::signal (signum, nsa->sa_handler); return osa->sa_handler == SIG_ERR ? -1 : 0; -#elif defined (ACE_LACKS_SIGACTION) +#elif defined (CHORUS) || defined (ACE_HAS_WINCE) || defined(ACE_PSOS) + ACE_UNUSED_ARG (signum); ACE_UNUSED_ARG (nsa); ACE_UNUSED_ARG (osa); ACE_NOTSUP_RETURN (-1); @@ -274,5 +271,3 @@ sigsuspend (const sigset_t *sigset) } } /* end namespace ACE_OS */ - -ACE_END_VERSIONED_NAMESPACE_DECL |