ChangeLogTag: Fri Jun 29 22:31:56 2001 Balachandran Natarajan <bala@cs.wustl.edu>

6 files changed, 29 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index 267169d5efc..d50f23af11f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Jun 29 22:31:56 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+	* Reverted the changes in this entry.
+	  Thu Jun 28 13:44:52 2001  Chad Elliott
+	  <elliott_c@ociweb.com>. The changes seem to be breaking the Sun
+	  builds. 
+
 Fri Jun 29 10:14:03 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
 	* ace/config-macosx.h: Removed some macros that don't apply to
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 267169d5efc..d50f23af11f 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,10 @@
+Fri Jun 29 22:31:56 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+	* Reverted the changes in this entry.
+	  Thu Jun 28 13:44:52 2001  Chad Elliott
+	  <elliott_c@ociweb.com>. The changes seem to be breaking the Sun
+	  builds. 
+
 Fri Jun 29 10:14:03 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
 	* ace/config-macosx.h: Removed some macros that don't apply to
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 267169d5efc..d50f23af11f 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,10 @@
+Fri Jun 29 22:31:56 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+	* Reverted the changes in this entry.
+	  Thu Jun 28 13:44:52 2001  Chad Elliott
+	  <elliott_c@ociweb.com>. The changes seem to be breaking the Sun
+	  builds. 
+
 Fri Jun 29 10:14:03 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
 	* ace/config-macosx.h: Removed some macros that don't apply to
diff --git a/ace/config-sunos5.5.h b/ace/config-sunos5.5.h
index ce5e4afa9ab..87805014742 100644
--- a/ace/config-sunos5.5.h
+++ b/ace/config-sunos5.5.h
@@ -11,10 +11,6 @@
 #define ACE_CONFIG_H
 #include "ace/pre.h"
 
-// Before we do anything, we should include <sys/feature_tests.h> to
-// ensure that things are set up properly.
-#include <sys/feature_tests.h>
-
 // Compiler version-specific settings:
 #if defined (__SUNPRO_CC)
 # if (__SUNPRO_CC < 0x410)
@@ -213,12 +209,6 @@
 // Platform supports the /proc file system.
 #define ACE_HAS_PROC_FS
 
-// Platform has posix getpwnam_r
-#if (defined (_POSIX_C_SOURCE) && _POSIX_C_SOURCE - 0 >= 199506L) || \
-    defined(_POSIX_PTHREAD_SEMANTICS)
-# define ACE_HAS_POSIX_GETPWNAM_R
-#endif /* _POSIX_C_SOURCE || _POSIX_PTHREAD_SEMANTICS */
-
 // Platform supports the prusage_t struct.
 #define ACE_HAS_PRUSAGE_T
 
diff --git a/ace/config-sunos5.6.h b/ace/config-sunos5.6.h
index 1c4998e6807..e08dd388545 100644
--- a/ace/config-sunos5.6.h
+++ b/ace/config-sunos5.6.h
@@ -127,9 +127,4 @@
 #  define ACE_HAS_SHM_OPEN
 #endif /* _POSIX_C_SOURCE > 2 */
 
-// The struct msghdr is conditional on SunOS 5.6 based on _XPG4_2
-#if defined(_XPG4_2)
-# define ACE_HAS_4_4BSD_SENDMSG_RECVMSG
-#endif /* _XPG4_2 */
-
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-sunos5.7.h b/ace/config-sunos5.7.h
index 9fb6f36481f..42d88066760 100644
--- a/ace/config-sunos5.7.h
+++ b/ace/config-sunos5.7.h
@@ -25,6 +25,13 @@
     typedef long          t_scalar_t;  /* historical versions */
     typedef unsigned long t_uscalar_t;
     typedef void          *timeout_id_t;
+
+# elif __GNUC__ >= 3 && __GNUC_MINOR__ >= 0
+#   define ACE_HAS_SOCKLEN_T
+#   define ACE_HAS_POSIX_GETPWNAM_R
+#   define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
+#   define ACE_HAS_4_4BSD_SENDMSG_RECVMSG
+
 # endif /* __GNUC__ <= 2  &&  __GNUC_MINOR__ < 8 */
 
 #elif defined (ghs)
@@ -48,7 +55,7 @@ typedef unsigned long long uint64_t;
 // performance-tests/Misc/preempt.
 #undef ACE_NEEDS_LWP_PRIO_SET
 
-// SunOS 5.7 can support Real-Time Signals and POSIX4 AIO operations
+// SunOS 2.7 can support Real-Time Signals and POSIX4 AIO operations
 // are supported.
 
 #if !defined (ACE_HAS_AIO_CALLS)
@@ -66,9 +73,6 @@ typedef unsigned long long uint64_t;
 #undef ACE_HAS_LIMITED_SELECT
 #endif /* ACE_HAS_LIMITED_SELECT */
 
-// SunOS 5.7 has socklen_t
-#define ACE_HAS_SOCKLEN_T
-
 #if defined (__sparcv9)
 #define ERRMAX 256 /* Needed for following define */
 #define ACE_LACKS_SYS_NERR