This commit was manufactured by cvs2svn to create branchtypecode-overhaul

'typecode-overhaul'.

1 files changed, 11 insertions, 0 deletions

diff --git a/ace/OS.h b/ace/OS.h
index 14f86e2a4ae..96864d4e5af 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -297,6 +297,9 @@ class ACE_Timeout_Manager;
 
 #   if defined (ACE_HAS_TERM_IOCTLS)
 #     include "ace/os_include/os_termios.h"
+#     if defined (HPUX)
+#       include /**/ <sys/modem.h>
+#     endif /* HPUX */
 #   endif /* ACE_HAS_TERM_IOCTLS */
 
 #   if defined (ACE_HAS_AIO_CALLS)
@@ -305,6 +308,14 @@ class ACE_Timeout_Manager;
 
 #     include "ace/os_include/os_limits.h"  // <sys/param.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_LACKS_UNIX_DOMAIN_SOCKETS) && !defined (VXWORKS)
 #     include "ace/os_include/sys/os_un.h"
 #   endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */