diff options
| -rw-r--r-- | ACE/ChangeLog | 8 | ||||
| -rw-r--r-- | ACE/ace/Sock_Connect.cpp | 4 | ||||
| -rw-r--r-- | ACE/ace/config-vxworks6.5.h | 4 |
3 files changed, 13 insertions, 3 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 1150e54d660..b9713fca6ba 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,7 +1,13 @@ +Tue Jul 3 14:29:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/config-vxworks6.5.h: + * ace/Sock_Connect.cpp: + VxWorks 6.5 rtp doesn't have getifaddrs + Tue Jul 3 13:08:42 UTC 2007 Jeff Parsons <j.parsons@vanderbilt.edu> * ace/CDR_Stream.h: - + Moved ostream operator declarations out of the #else branch of #if defined (__ACE_INLINE__), where they were mistakenly put originally. diff --git a/ACE/ace/Sock_Connect.cpp b/ACE/ace/Sock_Connect.cpp index 460770d0117..a38b81d7b1f 100644 --- a/ACE/ace/Sock_Connect.cpp +++ b/ACE/ace/Sock_Connect.cpp @@ -36,7 +36,7 @@ # endif /*ACE_VXWORKS */ # endif /* ACE_HAS_GETIFADDRS */ -#if defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x600) +#if defined (ACE_VXWORKS) && !defined (ACE_HAS_GETIFADDRS) #include /**/ <inetLib.h> #include /**/ <netinet/in_var.h> #if defined (ACE_HAS_IPV6) @@ -1235,7 +1235,7 @@ ACE::get_ip_interfaces (size_t &count, return get_ip_interfaces_aix (count, addrs); #elif defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x600) return get_ip_interfaces_vxworks_lt600 (count, addrs); -#elif (defined (__unix) || defined (__unix__) || defined (__Lynx__) || defined (ACE_OPENVMS) || defined (ACE_HAS_RTEMS)) && !defined (ACE_LACKS_NETWORKING) +#elif (defined (__unix) || defined (__unix__) || defined (__Lynx__) || defined (ACE_OPENVMS) || (defined (ACE_VXWORKS) && (ACE_VXWORKS == 0x650)) || defined (ACE_HAS_RTEMS)) && !defined (ACE_LACKS_NETWORKING) // COMMON (SVR4 and BSD) UNIX CODE // Call specific routine as necessary. diff --git a/ACE/ace/config-vxworks6.5.h b/ACE/ace/config-vxworks6.5.h index 9f65880760b..1af14a9d13c 100644 --- a/ACE/ace/config-vxworks6.5.h +++ b/ACE/ace/config-vxworks6.5.h @@ -16,6 +16,10 @@ #include "ace/config-vxworks6.4.h" +#if defined (__RTP__) +# undef ACE_HAS_GETIFADDRS +#endif + #include /**/ "ace/post.h" #endif /* ACE_CONFIG_VXWORKS_6_5_H */ |