summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2006-11-07 15:45:43 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2006-11-07 15:45:43 +0000
commit850515b3851d3539a105d9401276804ac7bc93d1 (patch)
treee92c5a3f477df85e4ac7c8f158475e9a748f1276
parent968b18659582c76299bc10052205b2a4f9929731 (diff)
downloadATCD-850515b3851d3539a105d9401276804ac7bc93d1.tar.gz
Tue Nov 7 15:44:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--ACE/ChangeLog7
-rw-r--r--ACE/ace/Sock_Connect.cpp7
2 files changed, 14 insertions, 0 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index a1e1e612c2b..67175d67b30 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,10 @@
+Tue Nov 7 15:44:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * ace/Sock_Connect.cpp:
+ With VxWorks 6.3 in rtp mode with IPv6 enabled declare the
+ in6addr_ constants explicitly, these are exported by the
+ VxWorks 6.3 rtp header files but not implemented
+
Tue Nov 07 13:31:10 UTC 2006 Martin Corino <mcorino@remedy.nl>
* include/makeinclude/platform_vxworks6.3.GNU:
diff --git a/ACE/ace/Sock_Connect.cpp b/ACE/ace/Sock_Connect.cpp
index 490573225bf..5737aff7f2e 100644
--- a/ACE/ace/Sock_Connect.cpp
+++ b/ACE/ace/Sock_Connect.cpp
@@ -49,6 +49,13 @@ extern "C" {
#include "ace/OS_NS_stdio.h"
#endif /* ACE_VXWORKS < 0x600 */
+#if defined (ACE_VXWORKS) && (ACE_VXWORKS == 0x630) && defined (__RTP__) && defined (ACE_HAS_IPV6)
+const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT;
+const struct in6_addr in6addr_nodelocal_allnodes = IN6ADDR_NODELOCAL_ALLNODES_INIT;
+const struct in6_addr in6addr_linklocal_allnodes = IN6ADDR_LINKLOCAL_ALLNODES_INIT;
+const struct in6_addr in6addr_linklocal_allrouters = IN6ADDR_LINKLOCAL_ALLROUTERS_INIT;
+#endif /* ACE_VXWORKS == 0x630 && __RTP__ && ACE_HAS_IPV6 */
+
#if defined (ACE_HAS_WINCE)
#include /**/ <Iphlpapi.h>
// The following code is suggested by microsoft as a workaround to the fact