diff options
| author | Olli Savia <ops@iki.fi> | 2009-10-24 12:20:03 +0000 |
|---|---|---|
| committer | Olli Savia <ops@iki.fi> | 2009-10-24 12:20:03 +0000 |
| commit | ea659a692ed9d3be007408cdf9d06fe897f3f90a (patch) | |
| tree | 9204e06105e348aa8d07dc9769dd0952aa8b4ad1 | |
| parent | 87153257360494cd5f29ba0e80527db49862c7c5 (diff) | |
| download | ATCD-ea659a692ed9d3be007408cdf9d06fe897f3f90a.tar.gz | |
ChangeLogTag: Sat Oct 24 12:18:00 UTC 2009 Olli Savia <ops@iki.fi>
| -rw-r--r-- | ACE/ChangeLog | 5 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_Thread.inl | 13 |
2 files changed, 9 insertions, 9 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index f61bf7bb56b..c9b27e4d430 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Sat Oct 24 12:18:00 UTC 2009 Olli Savia <ops@iki.fi> + + * ace/OS_NS_Thread.inl: + LynxOS improvements. + Sat Oct 24 12:15:40 UTC 2009 Olli Savia <ops@iki.fi> * ace/OS_NS_string.cpp (strsignal): diff --git a/ACE/ace/OS_NS_Thread.inl b/ACE/ace/OS_NS_Thread.inl index bddcd067859..5f584cdfe15 100644 --- a/ACE/ace/OS_NS_Thread.inl +++ b/ACE/ace/OS_NS_Thread.inl @@ -2500,20 +2500,15 @@ ACE_OS::sigwait (sigset_t *sset, int *sig) return *sig; #endif /* _POSIX_C_SOURCE - 0 >= 199506L || _POSIX_PTHREAD_SEMANTICS */ # elif defined (ACE_HAS_PTHREADS) - // LynxOS and Digital UNIX have their own hoops to jump through. -# if defined (__Lynx__) - // Second arg is a void **, which we don't need (the selected - // signal number is returned). - *sig = ::sigwait (sset, 0); - return *sig; -# elif defined (DIGITAL_UNIX) && defined (__DECCXX_VER) + // Digital UNIX has own hoops to jump through. +# if defined (DIGITAL_UNIX) && defined (__DECCXX_VER) // DEC cxx (but not g++) needs this direct call to its internal // sigwait (). This allows us to #undef sigwait, so that we can // have ACE_OS::sigwait. cxx gets confused by ACE_OS::sigwait // if sigwait is _not_ #undef'ed. errno = ::_Psigwait (sset, sig); return errno == 0 ? *sig : -1; -# else /* ! __Lynx __ && ! (DIGITAL_UNIX && __DECCXX_VER) */ +# else /* !(DIGITAL_UNIX && __DECCXX_VER) */ # if defined (CYGWIN32) // Cygwin has sigwait definition, but it is not implemented ACE_UNUSED_ARG (sset); @@ -2525,7 +2520,7 @@ ACE_OS::sigwait (sigset_t *sset, int *sig) errno = ::sigwait (sset, sig); return errno == 0 ? *sig : -1; # endif /* CYGWIN32 */ -# endif /* ! __Lynx__ && ! (DIGITAL_UNIX && __DECCXX_VER) */ +# endif /* !(DIGITAL_UNIX && __DECCXX_VER) */ # elif defined (ACE_HAS_WTHREADS) ACE_UNUSED_ARG (sset); ACE_NOTSUP_RETURN (-1); |