ChangeLogTag:Mon Oct 27 22:25:06 UTC 2003 Don Hinton <dhinton@dresystems.com>

10 files changed, 39 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 03f1e96074f..059b75d0a6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Oct 27 22:25:06 UTC 2003  Don Hinton  <dhinton@dresystems.com>
+
+        * ?
+          Fixed Sun compile errors. 
+
 Mon Oct 27 20:43:33 UTC 2003  Don Hinton  <dhinton@dresystems.com>
 
         * ?
diff --git a/ace/OS.h b/ace/OS.h
index c1d6ed5984a..24f261f1c25 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -36,6 +36,7 @@
 #include "ace/OS_NS_netdb.h"
 #include "ace/OS_NS_poll.h"
 #include "ace/OS_NS_pwd.h"
+#include "ace/OS_NS_regex.h"
 #include "ace/OS_NS_signal.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_stdlib.h"
diff --git a/ace/OS_NS_Thread.h b/ace/OS_NS_Thread.h
index b9480257c6a..e48e654fe60 100644
--- a/ace/OS_NS_Thread.h
+++ b/ace/OS_NS_Thread.h
@@ -30,6 +30,7 @@
 # include "ace/os_include/os_pthread.h"
 # include "ace/Base_Thread_Adapter.h"
 # include "ace/os_include/sys/os_sem.h"
+# include "ace/os_include/os_semaphore.h"
 # include "ace/OS_Memory.h"
 
 # if defined (ACE_HAS_PRIOCNTL)
diff --git a/ace/OS_NS_Thread.inl b/ace/OS_NS_Thread.inl
index 3f158e8c4dc..45f7b66e81f 100644
--- a/ace/OS_NS_Thread.inl
+++ b/ace/OS_NS_Thread.inl
@@ -7,12 +7,9 @@
 #include "ace/OS_NS_sys_time.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_unistd.h"
-
-#if defined (ACE_LACKS_CONST_TIMESPEC_PTR)
-typedef struct timespec * ACE_TIMESPEC_PTR;
-#else
-typedef const struct timespec * ACE_TIMESPEC_PTR;
-#endif /* HPUX */
+#if defined (ACE_HAS_PRIOCNTL)
+#  include /**/ <sys/priocntl.h>
+#endif /* ACE_HAS_PRIOCNTL */
 
 /*****************************************************************************/
 
diff --git a/ace/OS_NS_sys_resource.inl b/ace/OS_NS_sys_resource.inl
index f01b3994c87..a061e888b54 100644
--- a/ace/OS_NS_sys_resource.inl
+++ b/ace/OS_NS_sys_resource.inl
@@ -1,6 +1,8 @@
 // -*- C++ -*-
 // $Id$
 
+#include "ace/OS_NS_errno.h"
+
 ACE_INLINE int
 ACE_OS::getrlimit (int resource, struct rlimit *rl)
 {
diff --git a/ace/OS_NS_time.inl b/ace/OS_NS_time.inl
index e67c033cf36..f14059e8a25 100644
--- a/ace/OS_NS_time.inl
+++ b/ace/OS_NS_time.inl
@@ -457,7 +457,7 @@ ACE_OS::time (time_t *tloc)
 }
 
 // Linux won't compile unless we explicitly use a namespace here.
-#if defined (linux)
+#if defined (linux) || defined (sun)
 namespace ACE_OS {
   ACE_INLINE long
   timezone (void)
diff --git a/ace/os_include/os_pthread.h b/ace/os_include/os_pthread.h
index 77e1282bd67..574e0d9c71c 100644
--- a/ace/os_include/os_pthread.h
+++ b/ace/os_include/os_pthread.h
@@ -24,6 +24,18 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#if defined (ACE_HAS_PRIOCNTL)
+   // Need to #include thread.h before #defining THR_BOUND, etc.,
+   // when building without threads on SunOS 5.x.
+#  if defined (sun)
+#    include /**/ <thread.h>
+#  endif /* sun */
+
+   // Need to #include these before #defining USYNC_PROCESS on SunOS 5.x.
+#  include /**/ <sys/rtpriocntl.h>
+#  include /**/ <sys/tspriocntl.h>
+#endif /* ACE_HAS_PRIOCNTL */
+
 #include "ace/os_include/sys/os_types.h"
 
 // This needs to go here *first* to avoid problems with AIX.
diff --git a/ace/os_include/os_regex.h b/ace/os_include/os_regex.h
index df0634b2510..fdc323c2a6d 100644
--- a/ace/os_include/os_regex.h
+++ b/ace/os_include/os_regex.h
@@ -30,6 +30,10 @@
 # include /**/ <regex.h>
 #endif /* !ACE_LACKS_REGEX_H */
 
+#if defined (ACE_HAS_REGEX)
+#  include /**/ <regexpr.h>
+#endif /* ACE_HAS_REGEX */
+
 // Place all additions (especially function declarations) within extern "C" {}
 #ifdef __cplusplus
 extern "C"
diff --git a/ace/os_include/os_time.h b/ace/os_include/os_time.h
index 5083070f29b..6ba9cc45aa9 100644
--- a/ace/os_include/os_time.h
+++ b/ace/os_include/os_time.h
@@ -81,6 +81,12 @@ extern "C"
 #  endif /* defined (ACE_PSOS_DIAB_PPC) */
 #endif /*  defined (ACE_PSOS) && !defined (USER_INCLUDE_SYS_TIME_TM) */
 
+#if defined (ACE_LACKS_CONST_TIMESPEC_PTR)
+typedef struct timespec * ACE_TIMESPEC_PTR;
+#else
+typedef const struct timespec * ACE_TIMESPEC_PTR;
+#endif /* HPUX */
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/ace/os_include/os_unistd.h b/ace/os_include/os_unistd.h
index 74df3005d1e..c7d7aafc3a5 100644
--- a/ace/os_include/os_unistd.h
+++ b/ace/os_include/os_unistd.h
@@ -36,6 +36,10 @@
 #  include /**/ <io.h>
 #endif /* ACE_WIN32 && !ACE_HAS_WINCE */
 
+#if defined (ACE_HAS_SYSINFO)
+#  include /**/ <sys/systeminfo.h>
+#endif /* ACE_HAS_SYS_INFO */
+
 #if !defined (ACE_LACKS_UNISTD_H)
 #  include /**/ <unistd.h>
 #endif /* !ACE_LACKS_UNISTD_H */