ChangeLogTag:Fri May 9 16:10:50 UTC 2003 Don Hinton <dhinton@dresystems.com>

5 files changed, 100 insertions, 45 deletions

diff --git a/ChangeLog b/ChangeLog
index 831388cb0a0..c2573b2f944 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+Fri May  9 16:10:50 UTC 2003  Don Hinton  <dhinton@dresystems.com>
+
+        * ace/OS.h:
+          Commented and moved more code, as listed below.
+
+        * ace/config-sunos5.5.h:
+          Added ACE_LACKS_STDINT_H.
+
+        * ace/os_include/stropts.h:
+          Moved includes of [sys/]timod.h, sys/filio.h, and sys/sockio.h
+          here.
+
+        * ace/os_include/sys/msg.h:
+          Moved ACE_HAS_BROKEN_MSG_H and ACE_LACKS_SYSV_MSQ_PROTOS
+          #ifdef's here.
+
 Fri May  9 01:20:49 UTC 2003  Don Hinton  <dhinton@dresystems.com>
 
         * ace/config-cygwin32.h:
diff --git a/ace/OS.h b/ace/OS.h
index 12a81473123..e6b03763d45 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -1356,19 +1356,19 @@ _make_##SERVICE_CLASS (ACE_Service_Object_Exterminator *gobbler) \
   // Need to #include thread.h before #defining THR_BOUND, etc.,
   // when building without threads on SunOS 5.x.
 #  if defined (sun)
-#    include /**/x <thread.h>
+#    include /**/ <thread.h>
 #  endif /* sun */
 
   // Need to #include these before #defining USYNC_PROCESS on SunOS 5.x.
-# include /**/x <sys/rtpriocntl.h>
-# include /**/x <sys/tspriocntl.h>
+# include /**/ <sys/rtpriocntl.h>
+# include /**/ <sys/tspriocntl.h>
 #endif /* ACE_HAS_PRIOCNTL */
 
 # if defined (ACE_HAS_THREADS)
 
 #   if defined (ACE_HAS_STHREADS)
-#     include /**/x <synch.h>
-#     include /**/x <thread.h>
+#     include /**/ <synch.h>
+#     include /**/ <thread.h>
 #     define ACE_SCOPE_PROCESS P_PID
 #     define ACE_SCOPE_LWP P_LWPID
 #     define ACE_SCOPE_THREAD (ACE_SCOPE_LWP + 1)
@@ -1709,10 +1709,10 @@ protected:
         // If we are on Solaris we can just reuse the existing
         // implementations of these synchronization types.
 #         if !defined (ACE_LACKS_RWLOCK_T)
-#           include /**/x <synch.h>
+#           include /**/ <synch.h>
 typedef rwlock_t ACE_rwlock_t;
 #         endif /* !ACE_LACKS_RWLOCK_T */
-#         include /**/x <thread.h>
+#         include /**/ <thread.h>
 #       endif /* (ACE_LACKS_PTHREAD_YIELD) && defined (ACE_HAS_THR_YIELD) */
 
 #     else
@@ -2090,7 +2090,7 @@ protected:
 #   elif defined (ACE_HAS_PTHREADS_UNIX98_EXT)
 typedef pthread_rwlock_t ACE_rwlock_t;
 #   elif defined (ACE_HAS_STHREADS)
-#     include /**/x <synch.h>
+#     include /**/ <synch.h>
 typedef rwlock_t ACE_rwlock_t;
 #   endif /* ACE_LACKS_RWLOCK_T */
 
@@ -3480,9 +3480,9 @@ extern "C" {
 #define RTLD_GLOBAL 3
 #endif /* !RTLD_GLOBAL */
 
-#   if defined (ACE_HAS_SOCKIO_H)
-#     include /**/x <sys/sockio.h>
-#   endif /* ACE_HAS_SOCKIO_ */
+//#   if defined (ACE_HAS_SOCKIO_H)
+//#     include /**/ <sys/sockio.h>
+//#   endif /* ACE_HAS_SOCKIO_ */
 
 // There must be a better way to do this...
 #   if !defined (RLIMIT_NOFILE)
@@ -3516,29 +3516,29 @@ extern "C"
 #     include "ace/os_include/sys/mman.h"
 #   endif /* ACE_HAS_BROKEN_MMAP_H */
 
-// OSF1 has problems with sys/msg.h and C++...
-#   if defined (ACE_HAS_BROKEN_MSG_H)
-#     define _KERNEL
-#   endif /* ACE_HAS_BROKEN_MSG_H */
-#   if !defined (ACE_LACKS_SYSV_MSG_H)
+//// OSF1 has problems with sys/msg.h and C++...
+//#   if defined (ACE_HAS_BROKEN_MSG_H)
+//#     define _KERNEL
+//#   endif /* ACE_HAS_BROKEN_MSG_H */
+//#   if !defined (ACE_LACKS_SYSV_MSG_H)
 #     include "ace/os_include/sys/msg.h"
-#   endif /* ACE_LACKS_SYSV_MSG_H */
-#   if defined (ACE_HAS_BROKEN_MSG_H)
-#     undef _KERNEL
-#   endif /* ACE_HAS_BROKEN_MSG_H */
+//#   endif /* ACE_LACKS_SYSV_MSG_H */
+//#   if defined (ACE_HAS_BROKEN_MSG_H)
+//#     undef _KERNEL
+//#   endif /* ACE_HAS_BROKEN_MSG_H */
 
-#   if defined (ACE_LACKS_SYSV_MSQ_PROTOS)
-extern "C"
-{
-  int msgget (key_t, int);
-  int msgrcv (int, void *, size_t, long, int);
-  int msgsnd (int, const void *, size_t, int);
-  int msgctl (int, int, struct msqid_ds *);
-}
-#   endif /* ACE_LACKS_SYSV_MSQ_PROTOS */
+//#   if defined (ACE_LACKS_SYSV_MSQ_PROTOS)
+//extern "C"
+//{
+//  int msgget (key_t, int);
+//  int msgrcv (int, void *, size_t, long, int);
+//  int msgsnd (int, const void *, size_t, int);
+//  int msgctl (int, int, struct msqid_ds *);
+//}
+//#   endif /* ACE_LACKS_SYSV_MSQ_PROTOS */
 
 #   if defined (ACE_HAS_PRIOCNTL)
-#     include /**/x <sys/priocntl.h>
+#     include /**/ <sys/priocntl.h>
 #   endif /* ACE_HAS_PRIOCNTL */
 
 #   if defined (ACE_HAS_IDTYPE_T)
@@ -4113,17 +4113,17 @@ typedef int ucontext_t;
 #   define SA_RESTART 0
 # endif /* SA_RESTART */
 
-# if defined (ACE_HAS_TIMOD_H)
-#   if defined (ACE_HAS_STL_QUEUE_CONFLICT)
-#     define queue _Queue_
-#   endif /* ACE_HAS_STL_QUEUE_CONFLICT */
-#   include /**/x <sys/timod.h>
-#   if defined (ACE_HAS_STL_QUEUE_CONFLICT)
-#     undef queue
-#   endif /* ACE_HAS_STL_QUEUE_CONFLICT */
-# elif defined (ACE_HAS_OSF_TIMOD_H)
-#   include /**/x <tli/timod.h>
-# endif /* ACE_HAS_TIMOD_H */
+//# if defined (ACE_HAS_TIMOD_H)
+//#   if defined (ACE_HAS_STL_QUEUE_CONFLICT)
+//#     define queue _Queue_
+//#   endif /* ACE_HAS_STL_QUEUE_CONFLICT */
+//#   include /**/ <sys/timod.h>
+//#   if defined (ACE_HAS_STL_QUEUE_CONFLICT)
+//#     undef queue
+//#   endif /* ACE_HAS_STL_QUEUE_CONFLICT */
+//# elif defined (ACE_HAS_OSF_TIMOD_H)
+//#   include /**/ <tli/timod.h>
+//# endif /* ACE_HAS_TIMOD_H */
 
 /**
  * @class ACE_Thread_ID
@@ -4372,9 +4372,9 @@ typedef double ACE_timer_t;
 # include "ace/os_include/syslog.h"
 # endif /* !defined (ACE_WIN32) && !defined (ACE_LACKS_UNIX_SYSLOG) */
 
-# if defined (ACE_HAS_SYS_FILIO_H)
-# include /**/x <sys/filio.h>
-# endif /* ACE_HAS_SYS_FILIO_H */
+//# if defined (ACE_HAS_SYS_FILIO_H)
+//# include /**/ <sys/filio.h>
+//# endif /* ACE_HAS_SYS_FILIO_H */
 
 # if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && !defined (__BORLANDC__)
       typedef struct _stat ACE_stat;
diff --git a/ace/config-sunos5.5.h b/ace/config-sunos5.5.h
index a884f01dab8..0151083814a 100644
--- a/ace/config-sunos5.5.h
+++ b/ace/config-sunos5.5.h
@@ -11,6 +11,8 @@
 #define ACE_CONFIG_H
 #include "ace/pre.h"
 
+#define ACE_LACKS_STDINT_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>
diff --git a/ace/os_include/stropts.h b/ace/os_include/stropts.h
index bc8a20d4f11..c33dcbf0f85 100644
--- a/ace/os_include/stropts.h
+++ b/ace/os_include/stropts.h
@@ -26,10 +26,30 @@
 
 #include "ace/os_include/unistd.h"
 
+#if defined (ACE_HAS_TIMOD_H)
+#  if defined (ACE_HAS_STL_QUEUE_CONFLICT)
+#    define queue _Queue_
+#  endif /* ACE_HAS_STL_QUEUE_CONFLICT */
+#  include /**/ <sys/timod.h>
+#  if defined (ACE_HAS_STL_QUEUE_CONFLICT)
+#    undef queue
+#  endif /* ACE_HAS_STL_QUEUE_CONFLICT */
+#elif defined (ACE_HAS_OSF_TIMOD_H)
+#  include /**/ <tli/timod.h>
+#endif /* ACE_HAS_TIMOD_H */
+
 #if !defined (ACE_LACKS_SYS_IOCTL_H)
 # include /**/ <sys/ioctl.h>
 #endif /* !ACE_LACKS_IOCTL_H */
 
+# if defined (ACE_HAS_SYS_FILIO_H)
+# include /**/ <sys/filio.h>
+# endif /* ACE_HAS_SYS_FILIO_H */
+
+#if defined (ACE_HAS_SOCKIO_H)
+#   include /**/ <sys/sockio.h>
+#endif /* ACE_HAS_SOCKIO_ */
+
 #if !defined (ACE_LACKS_STROPTS_H)
 # include /**/ <stropts.h>
 #endif /* !ACE_LACKS_STROPTS_H */
diff --git a/ace/os_include/sys/msg.h b/ace/os_include/sys/msg.h
index a169c2da68a..43bf7028d7b 100644
--- a/ace/os_include/sys/msg.h
+++ b/ace/os_include/sys/msg.h
@@ -27,12 +27,29 @@
 #include "ace/os_include/sys/ipc.h"
 
 #if !defined (ACE_LACKS_SYS_MSG_H)
-# include /**/ <sys/msg.h>
+// OSF1 has problems with sys/msg.h and C++...
+#  if defined (ACE_HAS_BROKEN_MSG_H)
+#    define _KERNEL
+#  endif /* ACE_HAS_BROKEN_MSG_H */
+#  include /**/ <sys/msg.h>
+#  if defined (ACE_HAS_BROKEN_MSG_H)
+#    undef _KERNEL
+#  endif /* ACE_HAS_BROKEN_MSG_H */
 #endif /* !ACE_LACKS_SYS_MSG_H */
 
 # if defined (ACE_LACKS_MSGBUF_T)
 struct msgbuf {};
 # endif /* ACE_LACKS_MSGBUF_T */
 
+#   if defined (ACE_LACKS_SYSV_MSQ_PROTOS)
+extern "C"
+{
+  int msgget (key_t, int);
+  int msgrcv (int, void *, size_t, long, int);
+  int msgsnd (int, const void *, size_t, int);
+  int msgctl (int, int, struct msqid_ds *);
+}
+#   endif /* ACE_LACKS_SYSV_MSQ_PROTOS */
+
 #include "ace/post.h"
 #endif /* ACE_OS_INCLUDE_SYS_MSG_H */