fixed used of ::sigwait with cxx 6.0, which now uses ACE_HAS_ONEARG_SIGWAIT

3 files changed, 10 insertions, 5 deletions

diff --git a/ace/OS.h b/ace/OS.h
index a38a64ca9c5..e93050e5dc6 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -1688,12 +1688,13 @@ typedef u_int ACE_thread_key_t;
 #undef sigfillset
 #endif /* linux && __OPTIMIZE__ */
 
-// sigwait is yet another macro on Digital UNIX 4.0,
+// sigwait is yet another macro on Digital UNIX 4.0, with cxx prior to 6.0,
 // just causing trouble when introducing member functions with the same name.
 // Thanks to Thilo Kielmann" <kielmann@informatik.uni-siegen.de> for this fix.
-#if defined (DIGITAL_UNIX)
-#undef sigwait
-#endif /* DIGITAL_UNIX */
+// I added the version discriminator:  David L. Levine  <levine@cs.wustl
+#if defined (DIGITAL_UNIX) && __DECCXX_VER < 60090006
+# undef sigwait
+#endif /* DIGITAL_UNIX && __DECCXX_VER < 60090006 */
 
 #if defined (ACE_HAS_BROKEN_SENDMSG)
 typedef struct msghdr ACE_SENDMSG_TYPE;
diff --git a/ace/OS.i b/ace/OS.i
index 536f31129dd..bfd572f3d10 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -4661,7 +4661,8 @@ ACE_OS::sigwait (sigset_t *set, int *sig)
   *sig = ::sigwait (set);
   return *sig;
 #else /* ACE_HAS_ONEARG_SETWAIT */
-#if defined (DIGITAL_UNIX) && __DECCXX_VER < 60090006
+#if defined (DIGITAL_UNIX)
+  // Only use if __DECCXX_VER < 60090006, otherwise use ACE_HAS_ONEARG_SIGWAIT.
   errno = ::__sigwaitd10 (set, sig);
 #elif defined (__Lynx__)
   // Second arg is a void **, which we don't need (the selected
diff --git a/ace/config-osf1-4.0.h b/ace/config-osf1-4.0.h
index 0564e078dd7..9b0f05b3881 100644
--- a/ace/config-osf1-4.0.h
+++ b/ace/config-osf1-4.0.h
@@ -16,6 +16,8 @@
 // DEC's CXX supports explicit template specialization.
 #define ACE_HAS_TEMPLATE_SPECIALIZATION
 
+#define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000)
+
 // Optimize ACE_Handle_Set for select().
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 
@@ -153,6 +155,7 @@
 #define ACE_HAS_SVR4_SIGNAL_T
 #if __DECCXX_VER >= 60090006
 # define ACE_HAS_SIGWAIT
+# define ACE_HAS_ONEARG_SIGWAIT
 #endif /* __DECCXX_VER >= 60090006 */
 
 // Compiler/platform has strerror().