diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-07-03 14:29:48 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-07-03 14:29:48 +0000 |
| commit | 7b40583282037258c4541c662314334475f4e230 (patch) | |
| tree | d351094dcf8bbe35edfd17c74c4985a03b3e04ea /ACE/ace/Sock_Connect.cpp | |
| parent | e08caf207f8e9395f048d48e3fd40920ae3f5c51 (diff) | |
| download | ATCD-7b40583282037258c4541c662314334475f4e230.tar.gz | |
Tue Jul 3 14:29:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'ACE/ace/Sock_Connect.cpp')
| -rw-r--r-- | ACE/ace/Sock_Connect.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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. |