summaryrefslogtreecommitdiff
path: root/ACE/ace/OS_NS_signal.inl
diff options
context:
space:
mode:
authorolli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2009-09-16 10:57:05 +0000
committerolli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2009-09-16 10:57:05 +0000
commitc358d089b1fe549a528f64b1adacb65febc5e6a0 (patch)
tree742eb8d498715a8ce0620fe04005595eff483f3e /ACE/ace/OS_NS_signal.inl
parent39be5d3a3ddfaaafc5489071080ad6a33d0633da (diff)
downloadATCD-c358d089b1fe549a528f64b1adacb65febc5e6a0.tar.gz
ChangeLogTag: Wed Sep 16 10:54:39 UTC 2009 Olli Savia <ops@iki.fi>
Diffstat (limited to 'ACE/ace/OS_NS_signal.inl')
-rw-r--r--ACE/ace/OS_NS_signal.inl24
1 files changed, 12 insertions, 12 deletions
diff --git a/ACE/ace/OS_NS_signal.inl b/ACE/ace/OS_NS_signal.inl
index 361acd405d0..de42f27e200 100644
--- a/ACE/ace/OS_NS_signal.inl
+++ b/ACE/ace/OS_NS_signal.inl
@@ -78,7 +78,7 @@ ACE_INLINE int
sigaddset (sigset_t *s, int signum)
{
ACE_OS_TRACE ("ACE_OS::sigaddset");
-#if defined (ACE_LACKS_SIGSET) || defined (ACE_LACKS_SIGSET_DEFINITIONS)
+#if defined (ACE_LACKS_SIGSET)
if (s == 0)
{
errno = EFAULT;
@@ -93,13 +93,13 @@ sigaddset (sigset_t *s, int signum)
return 0 ;
#else
ACE_OSCALL_RETURN (::sigaddset (s, signum), int, -1);
-#endif /* ACE_LACKS_SIGSET || ACE_LACKS_SIGSET_DEFINITIONS */
+#endif /* ACE_LACKS_SIGSET */
}
ACE_INLINE int
sigdelset (sigset_t *s, int signum)
{
-#if defined (ACE_LACKS_SIGSET) || defined (ACE_LACKS_SIGSET_DEFINITIONS)
+#if defined (ACE_LACKS_SIGSET)
if (s == 0)
{
errno = EFAULT;
@@ -114,13 +114,13 @@ sigdelset (sigset_t *s, int signum)
return 0;
#else
ACE_OSCALL_RETURN (::sigdelset (s, signum), int, -1);
-#endif /* ACE_LACKS_SIGSET || ACE_LACKS_SIGSET_DEFINITIONS */
+#endif /* ACE_LACKS_SIGSET */
}
ACE_INLINE int
sigemptyset (sigset_t *s)
{
-#if defined (ACE_LACKS_SIGSET) || defined (ACE_LACKS_SIGSET_DEFINITIONS)
+#if defined (ACE_LACKS_SIGSET)
if (s == 0)
{
errno = EFAULT;
@@ -130,13 +130,13 @@ sigemptyset (sigset_t *s)
return 0;
#else
return ace_sigemptyset_helper (s);
-#endif /* ACE_LACKS_SIGSET || ACE_LACKS_SIGSET_DEFINITIONS */
+#endif /* ACE_LACKS_SIGSET */
}
ACE_INLINE int
sigfillset (sigset_t *s)
{
-#if defined (ACE_LACKS_SIGSET) || defined (ACE_LACKS_SIGSET_DEFINITIONS)
+#if defined (ACE_LACKS_SIGSET)
if (s == 0)
{
errno = EFAULT;
@@ -146,13 +146,13 @@ sigfillset (sigset_t *s)
return 0 ;
#else
return ace_sigfillset_helper (s);
-#endif /* ACE_LACKS_SIGSET || ACE_LACKS_SIGSET_DEFINITIONS */
+#endif /* ACE_LACKS_SIGSET */
}
ACE_INLINE int
sigismember (sigset_t *s, int signum)
{
-#if defined (ACE_LACKS_SIGSET) || defined (ACE_LACKS_SIGSET_DEFINITIONS)
+#if defined (ACE_LACKS_SIGSET)
if (s == 0)
{
errno = EFAULT;
@@ -173,7 +173,7 @@ sigismember (sigset_t *s, int signum)
}
# endif /* ACE_HAS_SIGISMEMBER_BUG */
ACE_OSCALL_RETURN (::sigismember (s, signum), int, -1);
-#endif /* ACE_LACKS_SIGSET || ACE_LACKS_SIGSET_DEFINITIONS */
+#endif /* ACE_LACKS_SIGSET */
}
ACE_INLINE ACE_SignalHandler
@@ -199,14 +199,14 @@ signal (int signum, ACE_SignalHandler func)
ACE_INLINE int
sigprocmask (int how, const sigset_t *nsp, sigset_t *osp)
{
-#if defined (ACE_LACKS_SIGSET) || defined (ACE_LACKS_SIGSET_DEFINITIONS)
+#if defined (ACE_LACKS_SIGSET)
ACE_UNUSED_ARG (how);
ACE_UNUSED_ARG (nsp);
ACE_UNUSED_ARG (osp);
ACE_NOTSUP_RETURN (-1);
#else
ACE_OSCALL_RETURN (::sigprocmask (how, nsp, osp), int, -1);
-#endif /* ACE_LACKS_SIGSET || ACE_LACKS_SIGSET_DEFINITIONS */
+#endif /* ACE_LACKS_SIGSET */
}
ACE_INLINE int