diff options
| author | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-11-18 16:05:01 +0000 |
|---|---|---|
| committer | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-11-18 16:05:01 +0000 |
| commit | d8fa768ac21fd4ba56d3ed17a2baab1bce0dff87 (patch) | |
| tree | f198062204dfe043344633594062e2f8caf8f66f | |
| parent | 6a8a5d53300557d36e25c98f6439b357c72075ff (diff) | |
| download | ATCD-d8fa768ac21fd4ba56d3ed17a2baab1bce0dff87.tar.gz | |
ChangeLogTag:Tue Nov 18 16:03:10 UTC 2003 Don Hinton <dhinton@dresystems.com>
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | ace/OS_NS_sys_mman.inl | 4 | ||||
| -rw-r--r-- | ace/RMCast/RMCast.h | 9 | ||||
| -rw-r--r-- | ace/config-all.h | 5 | ||||
| -rw-r--r-- | protocols/ace/RMCast/RMCast.h | 9 | ||||
| -rw-r--r-- | tests/Max_Default_Port_Test.cpp | 2 |
6 files changed, 35 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 0ed39a7e748..5bb7267198a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +Tue Nov 18 16:03:10 UTC 2003 Don Hinton <dhinton@dresystems.com> + + Thanks to Olli Savia <ops@iki.fi> for the following patches: + + * ace/OS_NS_sys_mman.inl: + Added #include OS_NS_sys_stat.h if __Lynx__ is defined. + + * ace/RMCast/RMCast.h: + Added #include /**/ <bsd/mbuf.h> before #undef'ing MT_DATA if + __Lynx__ is defined, since it's MT_DATA is defined in this file. + + * tests/Max_Default_Port_Test.cpp: + Changed NULL to 0 to fix compile problem on LynxOS. + Tue Nov 18 15:01:49 2003 Simon McQueen <sm@prismtechnologies.com> * ace/Log_Msg.h: diff --git a/ace/OS_NS_sys_mman.inl b/ace/OS_NS_sys_mman.inl index 8a866b29e2b..6b655733775 100644 --- a/ace/OS_NS_sys_mman.inl +++ b/ace/OS_NS_sys_mman.inl @@ -8,6 +8,10 @@ #include "ace/OS_NS_errno.h" #include "ace/os_include/sys/os_mman.h" +#if defined (__Lynx__) +# include "ace/OS_NS_sys_stat.h" +#endif /* __Lynx__ */ + #if defined (ACE_HAS_VOIDPTR_MMAP) // Needed for some odd OS's (e.g., SGI). typedef void *ACE_MMAP_TYPE; diff --git a/ace/RMCast/RMCast.h b/ace/RMCast/RMCast.h index 9d9d7650e54..4646a6bf0c2 100644 --- a/ace/RMCast/RMCast.h +++ b/ace/RMCast/RMCast.h @@ -30,9 +30,12 @@ class ACE_Message_Block; class ACE_RMCast_Proxy; // LynxOS 3.X defines the following macro -#if defined(MT_DATA) -#undef MT_DATA -#endif /* MT_DATA */ +#if defined (__Lynx__) +# include <bsd/mbuf.h> +# if defined(MT_DATA) +# undef MT_DATA +# endif /* MT_DATA */ +#endif /* __Lynx__ */ //! The RMCast namespace /*! diff --git a/ace/config-all.h b/ace/config-all.h index de52bad284b..8c9f30437a8 100644 --- a/ace/config-all.h +++ b/ace/config-all.h @@ -726,8 +726,11 @@ namespace ACE_OS {} # define ACE_OS_TLI ACE_OS #endif /* ACE_OS_TLI */ +// These includes are here to avoid circular dependencies. +#ifndef ACE_OS_MAIN_H // Keep this at the bottom of the file. It contains the main macros. -#include "ace/OS_main.h" +# include "ace/OS_main.h" +#endif /* ACE_OS_MAIN_h */ #include /**/ "ace/post.h" diff --git a/protocols/ace/RMCast/RMCast.h b/protocols/ace/RMCast/RMCast.h index 9d9d7650e54..4646a6bf0c2 100644 --- a/protocols/ace/RMCast/RMCast.h +++ b/protocols/ace/RMCast/RMCast.h @@ -30,9 +30,12 @@ class ACE_Message_Block; class ACE_RMCast_Proxy; // LynxOS 3.X defines the following macro -#if defined(MT_DATA) -#undef MT_DATA -#endif /* MT_DATA */ +#if defined (__Lynx__) +# include <bsd/mbuf.h> +# if defined(MT_DATA) +# undef MT_DATA +# endif /* MT_DATA */ +#endif /* __Lynx__ */ //! The RMCast namespace /*! diff --git a/tests/Max_Default_Port_Test.cpp b/tests/Max_Default_Port_Test.cpp index 90a3d598364..fae5a0d3ef9 100644 --- a/tests/Max_Default_Port_Test.cpp +++ b/tests/Max_Default_Port_Test.cpp @@ -72,7 +72,7 @@ int My_Accept_Handler::handle_input (ACE_HANDLE) { - if (this->peer_acceptor_.accept(this->stream_, NULL) == -1) { + if (this->peer_acceptor_.accept(this->stream_, 0) == -1) { ACE_ERROR((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("peer_acceptor.accept"))); ACE_OS::exit(1); |