summaryrefslogtreecommitdiff
path: root/ACE/ace
diff options
context:
space:
mode:
authorolli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2011-03-12 09:29:37 +0000
committerolli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2011-03-12 09:29:37 +0000
commit1d8d026127dc2347c232f0d3ebec976de837a1cc (patch)
tree28c8558fa686be9444bef03454dc2b637bb05192 /ACE/ace
parent9576fcbcd6535f56607614c139fa093e564d6103 (diff)
downloadATCD-1d8d026127dc2347c232f0d3ebec976de837a1cc.tar.gz
ChangeLogTag: Sat Mar 12 09:26:56 UTC 2011 Olli Savia <ops@iki.fi>
Diffstat (limited to 'ACE/ace')
-rw-r--r--ACE/ace/config-linux-common.h5
-rw-r--r--ACE/ace/config-linux.h2
2 files changed, 4 insertions, 3 deletions
diff --git a/ACE/ace/config-linux-common.h b/ACE/ace/config-linux-common.h
index 776d115046a..c9632b7e494 100644
--- a/ACE/ace/config-linux-common.h
+++ b/ACE/ace/config-linux-common.h
@@ -52,7 +52,10 @@
// AIO support pulls in the rt library, which pulls in the pthread
// library. Disable AIO in single-threaded builds.
-#if !defined (ACE_HAS_THREADS)
+#if defined (ACE_HAS_THREADS)
+# define ACE_HAS_CLOCK_GETTIME
+# define ACE_HAS_CLOCK_SETTIME
+#else
# undef ACE_HAS_AIO_CALLS
#endif
diff --git a/ACE/ace/config-linux.h b/ACE/ace/config-linux.h
index fcc2d124133..d3cb222089a 100644
--- a/ACE/ace/config-linux.h
+++ b/ACE/ace/config-linux.h
@@ -20,8 +20,6 @@
#define ACE_HAS_SVR4_DYNAMIC_LINKING
#define ACE_HAS_AUTOMATIC_INIT_FINI
#define ACE_HAS_DLSYM_SEGFAULT_ON_INVALID_HANDLE
-#define ACE_HAS_CLOCK_GETTIME
-#define ACE_HAS_CLOCK_SETTIME
#define ACE_HAS_RECURSIVE_MUTEXES
#define ACE_HAS_THREAD_SPECIFIC_STORAGE
#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS