summaryrefslogtreecommitdiff
path: root/ace
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2004-04-21 17:47:06 +0000
committerSteve Huston <shuston@riverace.com>2004-04-21 17:47:06 +0000
commitcaffc64516acf71f74decd30c6ca1fc23f3b33d2 (patch)
tree8f442f708cbfe8efde20ac35dcc59799216e31f8 /ace
parentcc0ec985c955a6aaf75f5da1d292df57e1d32970 (diff)
downloadATCD-caffc64516acf71f74decd30c6ca1fc23f3b33d2.tar.gz
ChangeLogTag:Wed Apr 21 13:36:41 2004 Steve Huston <shuston@riverace.com>
Diffstat (limited to 'ace')
-rw-r--r--ace/os_include/os_time.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/ace/os_include/os_time.h b/ace/os_include/os_time.h
index 2e2936235fe..17d945a7074 100644
--- a/ace/os_include/os_time.h
+++ b/ace/os_include/os_time.h
@@ -29,7 +29,12 @@
// To get the proper select() signature, this is required for HP-UX, and
// maybe other platforms that offer both int and fdset forms of select().
-#include "ace/os_include/sys/os_time.h"
+// For HP-UX, sys/time.h must be included before time.h, or
+// _XOPEN_SOURCE_EXTENDED must be defined. It's not nice to require
+// the preprocessor macro, so we force our select() preference this way.
+#if !defined (ACE_LACKS_SYS_TIME_H)
+# include /**/ <sys/time.h>
+#endif /* !ACE_LACKS_SYS_TIME_H */
#if !defined (ACE_LACKS_TIME_H)
# include /**/ <time.h>