ChangeLogTag: Tue Jun 22 07:27:27 2004 J.T. Conklin <jtc@acorntoolworks.com>

23 files changed, 68 insertions, 38 deletions

diff --git a/ChangeLog b/ChangeLog
index e98a6b6c275..2873cde9efe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+Tue Jun 22 07:27:27 2004  J.T. Conklin  <jtc@acorntoolworks.com>
+
+	* configure.ac:
+	* ace/OS_NS_sys_time.inl:
+	* ace/README:
+	* ace/config-cygwin32.h:
+	* ace/config-hpux-10.x.h:
+	* ace/config-hpux-11.00.h:
+	* ace/config-hpux11.h:
+	* ace/config-linux-common.h:
+	* ace/config-macosx-panther.h:
+	* ace/config-macosx.h:
+	* ace/config-rtems.h:
+	* ace/config-sco-4.2-nothread.h:
+	* ace/config-sco-5.0.0-mit-pthread.h:
+	* ace/config-sunos4-lucid3.2.h:
+	* ace/config-sunos4-sun3.x.h:
+	* ace/config-sunos4-sun4.1.4.h:
+	* ace/config-sunos4-sun4.x.h:
+	* ace/config-tandem.h:
+	* ace/config-unixware-7.1.0.h:
+	* ace/config-unixware-7.1.0.udk.h:
+	* ace/os_include/sys/os_time.h:
+	* m4/config_h.m4:
+	  Renamed ACE_HAS_SUNOS4_GETTIMEOFDAY to ACE_HAS_VOIDPTR_GETTIMEOFDAY.
+	  Changed canned SunOS 4 configs to use ACE_HAS_TIMEZONE_GETTIMEOFDAY,
+	  as SunOS wasn't changed to use a void * until SunOS 5/Solaris 2.
+
 Tue Jun 22 13:57:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/config-lite.h:
diff --git a/ace/OS_NS_sys_time.inl b/ace/OS_NS_sys_time.inl
index 0876d08de60..a2c25b18e5d 100644
--- a/ace/OS_NS_sys_time.inl
+++ b/ace/OS_NS_sys_time.inl
@@ -52,6 +52,7 @@ ACE_OS::gettimeofday (void)
   tv.tv_usec = tb.tb_low / 1000L;
 #else
 # if defined (ACE_HAS_TIMEZONE_GETTIMEOFDAY) || \
+  defined(ACE_HAS_VOIDPTR_GETTIMEOFDAY) || \
   (defined (ACE_HAS_SVR4_GETTIMEOFDAY) && !defined (m88k) && !defined (SCO))
   ACE_OSCALL (::gettimeofday (&tv, 0), int, -1, result);
 # elif defined (VXWORKS) || defined (CHORUS) || defined (ACE_PSOS)
diff --git a/ace/README b/ace/README
index 143867a9019..a73dc6dda6d 100644
--- a/ace/README
+++ b/ace/README
@@ -568,7 +568,6 @@ ACE_HAS_STRING_CLASS                    Platform/Compiler supports a
 ACE_HAS_STRUCT_NETDB_DATA               Compiler/platform has strange
                                         hostent API for socket *_r()
                                         calls
-ACE_HAS_SUNOS4_GETTIMEOFDAY             SunOS 4 style prototype.
 ACE_HAS_SUNOS4_SIGNAL_T                 Compiler has horrible SunOS
                                         4.x signal handlers...
 ACE_HAS_SVR4_DYNAMIC_LINKING            Compiler/platform supports
@@ -668,6 +667,9 @@ ACE_HAS_VERBOSE_NOTSUP                  Prints out console message in
                                         ACE_NOTSUP.  Useful for
                                         tracking down origin of
                                         ACE_NOTSUP.
+ACE_HAS_VOIDPTR_GETTIMEOFDAY            Platform/compiler supports
+					void * as second parameter 
+					to gettimeofday
 ACE_HAS_VOIDPTR_MMAP                    Platform requires void * for
                                         mmap().
 ACE_HAS_VOIDPTR_SOCKOPT                 OS/compiler uses void * arg 4
diff --git a/ace/config-cygwin32.h b/ace/config-cygwin32.h
index 7fad10ec9bd..941e873a15c 100644
--- a/ace/config-cygwin32.h
+++ b/ace/config-cygwin32.h
@@ -105,7 +105,7 @@
 
 #define ACE_LACKS_MADVISE
 
-#define ACE_HAS_SUNOS4_GETTIMEOFDAY
+#define ACE_HAS_VOIDPTR_GETTIMEOFDAY
 
 // Compiler/platform supports strerror ().
 #define ACE_HAS_STRERROR
diff --git a/ace/config-hpux-10.x.h b/ace/config-hpux-10.x.h
index 12b251c651e..628307e98fd 100644
--- a/ace/config-hpux-10.x.h
+++ b/ace/config-hpux-10.x.h
@@ -121,8 +121,8 @@ extern int h_errno;     /* This isn't declared in a header file on HP-UX */
 // Compiler/platform supports strerror ().
 #define ACE_HAS_STRERROR
 
-// SunOS 4 style prototype for gettimeofday
-#define ACE_HAS_SUNOS4_GETTIMEOFDAY
+// Platform/compiler supports void * as second parameter to gettimeofday().
+#define ACE_HAS_VOIDPTR_GETTIMEOFDAY
 
 // HP/UX has an undefined syscall for GETRUSAGE...
 #define ACE_HAS_SYSCALL_GETRUSAGE
diff --git a/ace/config-hpux-11.00.h b/ace/config-hpux-11.00.h
index 931d9cb5a8a..df726c6c163 100644
--- a/ace/config-hpux-11.00.h
+++ b/ace/config-hpux-11.00.h
@@ -323,8 +323,8 @@
 // Compiler/platform supports strerror ().
 #define ACE_HAS_STRERROR
 
-// SunOS 4 style prototype for gettimeofday
-#define ACE_HAS_SUNOS4_GETTIMEOFDAY
+// Platform/compiler supports void * as second parameter to gettimeofday().
+#define ACE_HAS_VOIDPTR_GETTIMEOFDAY
 
 // Platform supports SVR4 dynamic linking semantics, in 64-bit mode only.
 // When used, this requires -ldl on the ACE library link line.
diff --git a/ace/config-hpux11.h b/ace/config-hpux11.h
index 0285a7442f6..843c4fed432 100644
--- a/ace/config-hpux11.h
+++ b/ace/config-hpux11.h
@@ -129,8 +129,8 @@
 // Compiler/platform supports strerror ().
 #define ACE_HAS_STRERROR
 
-// SunOS 4 style prototype for gettimeofday
-#define ACE_HAS_SUNOS4_GETTIMEOFDAY
+// Platform/compiler supports void * as second parameter to gettimeofday().
+#define ACE_HAS_VOIDPTR_GETTIMEOFDAY
 
 // Platform supports SVR4 dynamic linking semantics, in 64-bit mode only.
 // When used, this requires -ldl on the ACE library link line.
diff --git a/ace/config-linux-common.h b/ace/config-linux-common.h
index 83706937da4..e0e3f9deddb 100644
--- a/ace/config-linux-common.h
+++ b/ace/config-linux-common.h
@@ -293,7 +293,8 @@
 // Compiler/platform contains the <sys/syscall.h> file.
 #define ACE_HAS_SYSCALL_H
 
-#define ACE_HAS_SUNOS4_GETTIMEOFDAY
+// Platform/compiler supports void * as second parameter to gettimeofday().
+#define ACE_HAS_VOIDPTR_GETTIMEOFDAY
 
 // Compiler/platform supports strerror ().
 #define ACE_HAS_STRERROR
diff --git a/ace/config-macosx-panther.h b/ace/config-macosx-panther.h
index 64e85855647..675fe72efc9 100644
--- a/ace/config-macosx-panther.h
+++ b/ace/config-macosx-panther.h
@@ -130,8 +130,8 @@
 // Platform provides <sys/filio.h> header.
 #define ACE_HAS_SYS_FILIO_H
 
-// Compiler/platform supports SVR4 gettimeofday() prototype
-#define ACE_HAS_SUNOS4_GETTIMEOFDAY
+// Platform/compiler supports void * as second parameter to gettimeofday().
+#define ACE_HAS_VOIDPTR_GETTIMEOFDAY
 #define ACE_HAS_TIMEZONE_GETTIMEOFDAY
 
 #define ACE_LACKS_SYS_MSG_H
diff --git a/ace/config-macosx.h b/ace/config-macosx.h
index 292e08ed1f7..1aca92e43aa 100644
--- a/ace/config-macosx.h
+++ b/ace/config-macosx.h
@@ -132,8 +132,8 @@
 // Platform provides <sys/filio.h> header.
 #define ACE_HAS_SYS_FILIO_H
 
-// Compiler/platform supports SVR4 gettimeofday() prototype
-#define ACE_HAS_SUNOS4_GETTIMEOFDAY
+// Platform/compiler supports void * as second parameter to gettimeofday().
+#define ACE_HAS_VOIDPTR_GETTIMEOFDAY
 #define ACE_HAS_TIMEZONE_GETTIMEOFDAY
 
 #define ACE_LACKS_SYS_MSG_H
diff --git a/ace/config-rtems.h b/ace/config-rtems.h
index f6b7ef844dd..51abb8be168 100644
--- a/ace/config-rtems.h
+++ b/ace/config-rtems.h
@@ -79,7 +79,7 @@
 #define ACE_HAS_SSIZE_T
 /* #define ACE_HAS_STANDARD_CPP_LIBRARY */
 #define ACE_HAS_STRERROR
-#define ACE_HAS_SUNOS4_GETTIMEOFDAY
+#define ACE_HAS_VOIDPTR_GETTIMEOFDAY
 #define ACE_HAS_SYS_ERRLIST
 #define ACE_HAS_SYS_FILIO_H
 #define ACE_HAS_TIMEZONE_GETTIMEOFDAY
diff --git a/ace/config-sco-4.2-nothread.h b/ace/config-sco-4.2-nothread.h
index 97c4a18e1d8..ba10b484f46 100644
--- a/ace/config-sco-4.2-nothread.h
+++ b/ace/config-sco-4.2-nothread.h
@@ -88,8 +88,8 @@
 // Compiler/platform supports strerror ().
 #define ACE_HAS_STRERROR
 
-// ???
-#define ACE_HAS_SUNOS4_GETTIMEOFDAY
+// Platform/compiler supports void * as second parameter to gettimeofday().
+#define ACE_HAS_VOIDPTR_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 c0b013d6892..fc43c24f358 100644
--- a/ace/config-sco-5.0.0-mit-pthread.h
+++ b/ace/config-sco-5.0.0-mit-pthread.h
@@ -92,7 +92,7 @@
 #define ACE_HAS_STRERROR
 
 // ???
-// #define ACE_HAS_SUNOS4_GETTIMEOFDAY
+// #define ACE_HAS_VOIDPTR_GETTIMEOFDAY
 #define ACE_HAS_TIMEZONE_GETTIMEOFDAY
 
 // HP/UX has an undefined syscall for GETRUSAGE...
diff --git a/ace/config-sunos4-lucid3.2.h b/ace/config-sunos4-lucid3.2.h
index 7ae16c9122f..062699f983a 100644
--- a/ace/config-sunos4-lucid3.2.h
+++ b/ace/config-sunos4-lucid3.2.h
@@ -65,8 +65,8 @@
 // Compiler/platform supports strerror ().
 // #define ACE_HAS_STRERROR
 
-// SunOS 4 style prototype.
-#define ACE_HAS_SUNOS4_GETTIMEOFDAY
+// Platform/compiler supports timezone * as second parameter to gettimeofday().
+#define ACE_HAS_TIMEZONE_GETTIMEOFDAY
 
 // Compiler/platform supports SVR4 dynamic linking semantics.
 #define ACE_HAS_SVR4_DYNAMIC_LINKING
diff --git a/ace/config-sunos4-sun3.x.h b/ace/config-sunos4-sun3.x.h
index 7f064c198bc..0ee548bff80 100644
--- a/ace/config-sunos4-sun3.x.h
+++ b/ace/config-sunos4-sun3.x.h
@@ -54,8 +54,8 @@
 // Platform supports STREAMS.
 #define ACE_HAS_STREAMS
 
-// SunOS 4 style prototype.
-#define ACE_HAS_SUNOS4_GETTIMEOFDAY
+// Platform/compiler supports timezone * as second parameter to gettimeofday().
+#define ACE_HAS_TIMEZONE_GETTIMEOFDAY
 
 // Compiler/platform supports SVR4 dynamic linking semantics.
 #define ACE_HAS_SVR4_DYNAMIC_LINKING
diff --git a/ace/config-sunos4-sun4.1.4.h b/ace/config-sunos4-sun4.1.4.h
index 6d95409d741..aa75e37665a 100644
--- a/ace/config-sunos4-sun4.1.4.h
+++ b/ace/config-sunos4-sun4.1.4.h
@@ -62,8 +62,8 @@
 // Platform supports STREAMS.
 #define ACE_HAS_STREAMS
 
-// SunOS 4 style prototype.
-#define ACE_HAS_SUNOS4_GETTIMEOFDAY
+// Platform/compiler supports timezone * as second parameter to gettimeofday().
+#define ACE_HAS_TIMEZONE_GETTIMEOFDAY
 
 // Compiler/platform supports SVR4 dynamic linking semantics.
 #define ACE_HAS_SVR4_DYNAMIC_LINKING
diff --git a/ace/config-sunos4-sun4.x.h b/ace/config-sunos4-sun4.x.h
index 81c8c936e2b..ee3e46e1a5c 100644
--- a/ace/config-sunos4-sun4.x.h
+++ b/ace/config-sunos4-sun4.x.h
@@ -67,8 +67,8 @@
 // Platform supports STREAMS.
 #define ACE_HAS_STREAMS
 
-// SunOS 4 style prototype.
-#define ACE_HAS_SUNOS4_GETTIMEOFDAY
+// Platform/compiler supports timezone * as second parameter to gettimeofday().
+#define ACE_HAS_TIMEZONE_GETTIMEOFDAY
 
 // Compiler/platform supports SVR4 dynamic linking semantics.
 #define ACE_HAS_SVR4_DYNAMIC_LINKING
diff --git a/ace/config-tandem.h b/ace/config-tandem.h
index 7f009c5ba40..4007cb5e477 100644
--- a/ace/config-tandem.h
+++ b/ace/config-tandem.h
@@ -326,7 +326,7 @@
 //ACE_HAS_STRICT                Use the STRICT compilation mode on Win32.
 //? ACE_HAS_STRUCT_NETDB_DATA           Compiler/platform has strange
 // hostent API for socket *_r() calls
-//ACE_HAS_SUNOS4_GETTIMEOFDAY           SunOS 4 style prototype.
+//ACE_HAS_VOIDPTR_GETTIMEOFDAY           
 //? ACE_HAS_SYSCALL_GETRUSAGE           HP/UX has an undefined syscall for
 //GETRUSAGE...
 //ACE_HAS_TEMPLATE_TYPEDEFS             Compiler implements templates that
diff --git a/ace/config-unixware-7.1.0.h b/ace/config-unixware-7.1.0.h
index 90c3ac94019..673f5c24561 100644
--- a/ace/config-unixware-7.1.0.h
+++ b/ace/config-unixware-7.1.0.h
@@ -258,9 +258,8 @@
 /* Platform has <strings.h> (which contains bzero() prototype) */
 #define ACE_HAS_STRINGS 1
 
-/* Platform has void * as second parameter to gettimeofday and a has a
-   prototype */
-#define ACE_HAS_SUNOS4_GETTIMEOFDAY 1
+/* Platform/compiler supports void * as second parameter to gettimeofday(). */
+#define ACE_HAS_VOIDPTR_GETTIMEOFDAY 1
 
 /* Compiler/platform supports SVR4 dynamic linking semantics */
 #define ACE_HAS_SVR4_DYNAMIC_LINKING 1
diff --git a/ace/config-unixware-7.1.0.udk.h b/ace/config-unixware-7.1.0.udk.h
index ccdbc28fe32..9f2b290cffc 100644
--- a/ace/config-unixware-7.1.0.udk.h
+++ b/ace/config-unixware-7.1.0.udk.h
@@ -318,9 +318,8 @@
 /* Platform has <strings.h> (which contains bzero() prototype) */
 #define ACE_HAS_STRINGS
 
-/* Platform has void * as second parameter to gettimeofday and a has a
-   prototype */
-#define ACE_HAS_SUNOS4_GETTIMEOFDAY
+/* Platform/compiler supports void * as second parameter to gettimeofday(). */
+#define ACE_HAS_VOIDPTR_GETTIMEOFDAY
 
 /* Compiler/platform supports SVR4 dynamic linking semantics */
 #define ACE_HAS_SVR4_DYNAMIC_LINKING
diff --git a/ace/os_include/sys/os_time.h b/ace/os_include/sys/os_time.h
index 8e04df7cb09..37edcd8d328 100644
--- a/ace/os_include/sys/os_time.h
+++ b/ace/os_include/sys/os_time.h
@@ -44,7 +44,7 @@ extern "C"
 # endif  /*  !m88k && !SCO */
 #elif defined (ACE_HAS_OSF1_GETTIMEOFDAY)
   int gettimeofday (struct timeval *tp, struct timezone * = 0);
-#elif defined (ACE_HAS_SUNOS4_GETTIMEOFDAY)
+#elif defined (ACE_HAS_VOIDPTR_GETTIMEOFDAY)
 # define ACE_HAS_SVR4_GETTIMEOFDAY
 #endif /* ACE_HAS_SVR4_GETTIMEOFDAY */
 
diff --git a/configure.ac b/configure.ac
index 3aa52b5f6b3..adda9c86b04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5714,7 +5714,7 @@ dnl We don't have a gettimeofday prototype
     ],
     [
      if test "$ace_cv_lib_voidptr_gettimeofday" = yes; then
-       AC_DEFINE([ACE_HAS_SUNOS4_GETTIMEOFDAY])
+       AC_DEFINE([ACE_HAS_VOIDPTR_GETTIMEOFDAY])
      else
        AC_DEFINE([ACE_HAS_TIMEZONE_GETTIMEOFDAY])
      fi
diff --git a/m4/config_h.m4 b/m4/config_h.m4
index b7fbff64120..d76fb182f6c 100644
--- a/m4/config_h.m4
+++ b/m4/config_h.m4
@@ -811,10 +811,6 @@ AH_TEMPLATE([ACE_HAS_STRINGS],
 AH_TEMPLATE([ACE_HAS_STRUCT_NETDB_DATA],
 [Compiler/platform has strange hostent API for socket *_r() calls])
 
-AH_TEMPLATE([ACE_HAS_SUNOS4_GETTIMEOFDAY],
-[Platform has void * as second parameter to gettimeofday and a has a
-   prototype])
-
 AH_TEMPLATE([ACE_HAS_SUNOS4_SIGNAL_T],
 [Compiler has horrible SunOS 4.x signal handlers...])
 
@@ -939,6 +935,10 @@ AH_TEMPLATE([ACE_HAS_VERBOSE_NOTSUP],
 [Prints out console message in ACE_NOTSUP.  Useful for tracking down
    origin of ACE_NOTSUP.])
 
+AH_TEMPLATE([ACE_HAS_VOIDPTR_GETTIMEOFDAY],
+[Platform/compiler supports void * as second parameter to 
+   gettimeofday() and has a prototype.])
+
 AH_TEMPLATE([ACE_HAS_VOIDPTR_MMAP],[Platform requires void * for mmap().])
 
 AH_TEMPLATE([ACE_HAS_VOIDPTR_SOCKOPT],