summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ace/OS.i4
-rw-r--r--ace/config-sco-5.0.0-fsu-pthread.h3
-rw-r--r--ace/config-sco-5.0.0-mit-pthread.h3
-rw-r--r--ace/config-sco-5.0.0-nothread.h3
4 files changed, 5 insertions, 8 deletions
diff --git a/ace/OS.i b/ace/OS.i
index 6bb8a71430c..d58a5dc4850 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -69,11 +69,11 @@ typedef char *ACE_MMAP_TYPE;
#endif /* ACE_HAS_SYS_FILIO_H */
#if defined (ACE_HAS_SVR4_GETTIMEOFDAY)
-#if !defined (m88k)
+#if !defined (m88k) && !defined (SCO)
extern "C" int gettimeofday (struct timeval *tp, void * = 0);
#else
extern "C" int gettimeofday (struct timeval *tp);
-#endif /* m88k */
+#endif /* !m88k && !SCO */
#elif defined (ACE_HAS_OSF1_GETTIMEOFDAY)
extern "C" int gettimeofday (struct timeval *tp, struct timezone * = 0);
#elif defined (ACE_HAS_SUNOS4_GETTIMEOFDAY)
diff --git a/ace/config-sco-5.0.0-fsu-pthread.h b/ace/config-sco-5.0.0-fsu-pthread.h
index 9d63a53a6f9..3eab0ef2a72 100644
--- a/ace/config-sco-5.0.0-fsu-pthread.h
+++ b/ace/config-sco-5.0.0-fsu-pthread.h
@@ -69,8 +69,7 @@
// Compiler/platform supports strerror ().
#define ACE_HAS_STRERROR
-// ???
-#define ACE_HAS_SUNOS4_GETTIMEOFDAY
+#define ACE_HAS_SVR4_GETTIMEOFDAY
// HP/UX has an undefined syscall for GETRUSAGE...
//#define ACE_HAS_SYSCALL_GETRUSAGE
diff --git a/ace/config-sco-5.0.0-mit-pthread.h b/ace/config-sco-5.0.0-mit-pthread.h
index 12e2a08ae20..2736290589f 100644
--- a/ace/config-sco-5.0.0-mit-pthread.h
+++ b/ace/config-sco-5.0.0-mit-pthread.h
@@ -77,8 +77,7 @@
// Compiler/platform supports strerror ().
#define ACE_HAS_STRERROR
-// ???
-#define ACE_HAS_SUNOS4_GETTIMEOFDAY
+#define ACE_HAS_SVR4_GETTIMEOFDAY
// HP/UX has an undefined syscall for GETRUSAGE...
//#define ACE_HAS_SYSCALL_GETRUSAGE
diff --git a/ace/config-sco-5.0.0-nothread.h b/ace/config-sco-5.0.0-nothread.h
index f4af849e70a..a8615c7381f 100644
--- a/ace/config-sco-5.0.0-nothread.h
+++ b/ace/config-sco-5.0.0-nothread.h
@@ -69,8 +69,7 @@
// Compiler/platform supports strerror ().
#define ACE_HAS_STRERROR
-// ???
-#define ACE_HAS_SUNOS4_GETTIMEOFDAY
+#define ACE_HAS_SVR4_GETTIMEOFDAY
// HP/UX has an undefined syscall for GETRUSAGE...
//#define ACE_HAS_SYSCALL_GETRUSAGE