ChangeLogTag:Mon Nov 3 16:43:27 UTC 2003 Don Hinton <dhinton@dresystems.com>

6 files changed, 36 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 4d3031d83ce..cea9a7e56ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+Mon Nov  3 16:43:27 UTC 2003  Don Hinton  <dhinton@dresystems.com>
+
+        * ace/OS_NS_dlfcn.inl:
+          Added missing #includes needed on HPUX due to recent
+          subsetting.
+
+        * ace/OS_NS_time.inl:
+          Changed #ifdef around ACE_OS::timezone implementation to be just
+          __GNUG__ since it seems to be needed on all OS's that use g++.
+
+        * ace/OS_NS_string.h:
+          Changed ACE_OS_Export to ACE_Export.
+
+        * ace/OS_NS_unistd.cpp:
+          Added #include of sys/pstat.h needed on HPUX.
+
+        * ace/os_include/os_termios.h:
+          Added #include of sys/modem.h on HPUX to pickup the MDTR
+          definition.
+
 Mon Nov  3 10:19:43 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/Makefile.bor:
diff --git a/ace/OS_NS_dlfcn.inl b/ace/OS_NS_dlfcn.inl
index 83291148f8a..1249f7b612f 100644
--- a/ace/OS_NS_dlfcn.inl
+++ b/ace/OS_NS_dlfcn.inl
@@ -2,7 +2,7 @@
 // $Id$
 
 #include "ace/OS_NS_macros.h"
-
+#include "ace/OS_NS_errno.h"
 
 ACE_INLINE int
 ACE_OS::dlclose (ACE_SHLIB_HANDLE handle)
@@ -66,7 +66,7 @@ ACE_OS::dlerror (void)
   ACE_OSCALL_RETURN ((char *)::dlerror (), char *, 0);
 #endif /* _M_UNIX */
 # elif defined (__hpux) || defined (VXWORKS)
-  ACE_OSCALL_RETURN (::strerror(errno), char *, 0);
+  ACE_OSCALL_RETURN (ACE_OS::strerror(errno), char *, 0);
 # elif defined (ACE_WIN32)
   static ACE_TCHAR buf[128];
 #   if defined (ACE_HAS_PHARLAP)
diff --git a/ace/OS_NS_string.h b/ace/OS_NS_string.h
index 1f1e59beffe..ad36a3a6206 100644
--- a/ace/OS_NS_string.h
+++ b/ace/OS_NS_string.h
@@ -37,7 +37,7 @@
 class ACE_Time_Value;
 
 # if defined (ACE_LACKS_SYS_NERR)
-extern ACE_OS_Export int sys_nerr;
+extern ACE_Export int sys_nerr;
 # endif /* ACE_LACKS_SYS_NERR */
 
 namespace ACE_OS {
diff --git a/ace/OS_NS_time.inl b/ace/OS_NS_time.inl
index acd96e294a1..2ebe521bb4a 100644
--- a/ace/OS_NS_time.inl
+++ b/ace/OS_NS_time.inl
@@ -458,7 +458,7 @@ ACE_OS::time (time_t *tloc)
 }
 
 // Linux won't compile unless we explicitly use a namespace here.
-#if defined (linux) || (defined (sun) && defined (__GNUG__))
+#if defined (__GNUG__)
 namespace ACE_OS {
   ACE_INLINE long
   timezone (void)
diff --git a/ace/OS_NS_unistd.cpp b/ace/OS_NS_unistd.cpp
index 714518dc4d1..c472f5d7cca 100644
--- a/ace/OS_NS_unistd.cpp
+++ b/ace/OS_NS_unistd.cpp
@@ -17,6 +17,14 @@ ACE_RCSID(ace, OS_NS_unistd, "$Id$")
 #include "ace/OS_NS_Thread.h"
 #include "ace/Object_Manager_Base.h"
 
+// This is here for ACE_OS::num_processors_online(). On HP-UX, it
+// needs sys/param.h (above) and sys/pstat.h. The implementation of the
+// num_processors_online() method also uses 'defined (__hpux)' to decide
+// whether or not to try the syscall.
+#if defined (__hpux)
+#  include /**/ <sys/pstat.h>
+#endif /* __hpux **/
+
 #if defined (ACE_NEEDS_FTRUNCATE)
 extern "C" int
 ftruncate (ACE_HANDLE handle, long len)
diff --git a/ace/os_include/os_termios.h b/ace/os_include/os_termios.h
index 03dede0787d..30f1f9971b2 100644
--- a/ace/os_include/os_termios.h
+++ b/ace/os_include/os_termios.h
@@ -28,6 +28,10 @@
 #  include /**/ <termios.h>
 #endif /* !ACE_LACKS_TERMIOS_H */
 
+#if defined (HPUX)
+#  include /**/ <sys/modem.h>
+#endif /* HPUX */
+
 // Place all additions (especially function declarations) within extern "C" {}
 #ifdef __cplusplus
 extern "C"