ChangeLogTag:Tue Jun 24 14:40:43 UTC 2003 Don Hinton <dhinton@dresystems.com>

6 files changed, 33 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 263fd8c22e9..7dafda4575b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+Tue Jun 24 14:40:43 UTC 2003  Don Hinton  <dhinton@dresystems.com>
+
+        * ace/String_Base.i:
+          Added include of Min_Max.h>  Thanks to Olli Savia <ops@iki.fi>
+          for reporting this and supplying the fix.
+
+        * ace/config-lynxos.h:
+        * ace/os_include/net/os_if.h:
+          Added new macro ACE_NEEDS_IPC_1C_H used to include ipc_1c.h
+          before net/if.h for LynxOS 3.1.0 and later.  Thanks to Olli
+          Savia <ops@iki.fi> for reporting this and supplying the fix.
+
+        * ace/os_include/os_signal.h:
+        * ace/os_include/os_ucontext.h:
+          Moved include of os_ucontext.h to bottom of os_signal.h and
+          included os_signal.h in os_ucontext.h.  Thanks to John Michael
+          Zorko <j.zorko@att.net> for reporting this.
+
 Tue Jun 24 03:50:21 UTC 2003  Don Hinton  <dhinton@dresystems.com>
 
         * ace/Based_Pointer_Repository.h:
diff --git a/ace/String_Base.i b/ace/String_Base.i
index 7d901747167..828e8b933c7 100644
--- a/ace/String_Base.i
+++ b/ace/String_Base.i
@@ -4,6 +4,7 @@
 
 
 #include "ace/Malloc_Base.h"
+#include "ace/Min_Max.h"
 
 // Default constructor.
 
diff --git a/ace/config-lynxos.h b/ace/config-lynxos.h
index 8adc204b827..fdf1e1d6f8e 100644
--- a/ace/config-lynxos.h
+++ b/ace/config-lynxos.h
@@ -44,6 +44,12 @@
 # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 0
 #endif /* __LYNXOS_SDK_VERSION */
 
+#if !defined ( __LYNXOS_SDK_VERSION )
+  // LynxOS 3.1.0 and later need ipc_1c.h to be included before net/if.h
+  // to avoid macro conflict.
+# define ACE_NEEDS_IPC_1C_H
+#endif /* __LYNXOS_SDK_VERSION */
+
 #if defined (__x86__)
   // PowerPC libraries don't seem to have alloca (), so only use with x86.
 // Although ACE does have alloca() on this compiler/platform combination, it is
diff --git a/ace/os_include/net/os_if.h b/ace/os_include/net/os_if.h
index 8f622767148..738a76e3755 100644
--- a/ace/os_include/net/os_if.h
+++ b/ace/os_include/net/os_if.h
@@ -24,6 +24,11 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#if defined (ACE_NEEDS_IPC_1C_H)
+   // LynxOS 3.1.0 and later need this
+#  include /**/ <ipc_1c.h>
+#endif /* ACE_NEEDS_IPC_1C_H */
+
 #if !defined (ACE_LACKS_NET_IF_H)
    // This part if to avoid STL name conflict with the map structure
    // in net/if.h.
diff --git a/ace/os_include/os_signal.h b/ace/os_include/os_signal.h
index 97f3aad4596..e961d1cd7b6 100644
--- a/ace/os_include/os_signal.h
+++ b/ace/os_include/os_signal.h
@@ -25,7 +25,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/os_include/sys/os_types.h"
-#include "ace/os_include/os_ucontext.h"
 #include "ace/os_include/os_time.h"
 
 #if !defined (ACE_LACKS_SINGNAL_H)
@@ -264,5 +263,7 @@ extern "C"
 }
 #endif /* __cplusplus */
 
+#include "ace/os_include/os_ucontext.h"
+
 #include "ace/post.h"
 #endif /* ACE_OS_INCLUDE_OS_SIGNAL_H */
diff --git a/ace/os_include/os_ucontext.h b/ace/os_include/os_ucontext.h
index f1441d0d699..28c1aa8c68a 100644
--- a/ace/os_include/os_ucontext.h
+++ b/ace/os_include/os_ucontext.h
@@ -24,9 +24,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-// @todo need to define sigset_t both here and in signal.h, but
-// there is a circular dependancy since signal.h needs to include ucontext.h
-//#include "ace/os_include/os_signal.h"
+#include "ace/os_include/os_signal.h"
 
 #if !defined (ACE_LACKS_UCONTEXT_H)
 #  include /**/ <ucontext.h>