summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlli Savia <ops@iki.fi>2006-03-14 15:51:49 +0000
committerOlli Savia <ops@iki.fi>2006-03-14 15:51:49 +0000
commitb35ca15471cb4a42b45b3d3ba39ed1b5c5675a31 (patch)
treeb002074610a8ee97c9710c3419c42a2d5bf63c80
parent8dfbc16aa54eee1dbc5d51afd488e472ba01186d (diff)
downloadATCD-b35ca15471cb4a42b45b3d3ba39ed1b5c5675a31.tar.gz
ChangeLogTag: Tue Mar 14 15:50:09 UTC 2006 Olli Savia <ops@iki.fi>
-rw-r--r--ChangeLog6
-rw-r--r--ace/OS_NS_Thread.cpp2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index be0ca8fa660..d2c10cc3a4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Mar 14 15:50:09 UTC 2006 Olli Savia <ops@iki.fi>
+
+ * ace/OS_NS_Thread.cpp:
+ Removed the :: prefix from pthread calls that are macros
+ on LynxOS.
+
Tue Mar 14 09:51:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
* bin/generate_rel_manpages:
diff --git a/ace/OS_NS_Thread.cpp b/ace/OS_NS_Thread.cpp
index 469e1f71760..7a9f9041fd3 100644
--- a/ace/OS_NS_Thread.cpp
+++ b/ace/OS_NS_Thread.cpp
@@ -5392,7 +5392,7 @@ ACE_OS::thr_setspecific_native (ACE_OS_thread_key_t key, void *data)
ACE_OSCALL_RETURN (::pthread_setspecific (key, data), int, -1);
# else
int result;
- ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_setspecific (key, data),
+ ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_setspecific (key, data),
result),
int, -1);
# endif /* ACE_HAS_PTHREADS_DRAFT4, 6 */