summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2005-06-01 16:22:34 +0000
committerSteve Huston <shuston@riverace.com>2005-06-01 16:22:34 +0000
commite1b1cfa503f2491ede1196943d1ebb9d90f3b247 (patch)
tree80ef26b5931adee1c02626ea26b80c6e5b524a62
parent87912e7277c50df013d9b98ee6663f345a1c09e9 (diff)
downloadATCD-e1b1cfa503f2491ede1196943d1ebb9d90f3b247.tar.gz
ChangeLogTag:Wed Jun 1 12:19:27 2005 Steve Huston <shuston@riverace.com>
-rw-r--r--ChangeLog9
-rw-r--r--ace/OS_NS_signal.inl2
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a114fc38f2d..90e8b6f45e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Wed Jun 1 12:19:27 2005 Steve Huston <shuston@riverace.com>
+
+ * ace/OS_NS_signal.inl: Reverted:
+ Tue May 31 18:51:31 2005 Steve Huston <shuston@riverace.com>
+ It broke builds on Linux and BSD, at least, with compile errors like:
+ `::' does not have a class or union named `sigaction'
+ I think this is probably an issue of including files in the wrong
+ order and it only trips up HP-UX, but I'm not sure.
+
Wed Jun 1 07:10:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
* bin/tao_orb_tests.lst:
diff --git a/ace/OS_NS_signal.inl b/ace/OS_NS_signal.inl
index 350eb50fb6d..a2159ad2604 100644
--- a/ace/OS_NS_signal.inl
+++ b/ace/OS_NS_signal.inl
@@ -37,7 +37,7 @@ pthread_sigmask (int how, const sigset_t *nsp, sigset_t *osp)
}
ACE_INLINE int
-sigaction (int signum, const struct ::sigaction *nsa, struct ::sigaction *osa)
+sigaction (int signum, const struct sigaction *nsa, struct sigaction *osa)
{
ACE_OS_TRACE ("ACE_OS::sigaction");
if (signum == 0)