summaryrefslogtreecommitdiff
path: root/ACE/ace/Sock_Connect.cpp
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2008-05-14 18:15:31 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2008-05-14 18:15:31 +0000
commitaaf7cb179cc4d72822c0a34ec6c9c605674b3a69 (patch)
tree37f32a8e2f78f9f7d175616f5b87e3fbfd920010 /ACE/ace/Sock_Connect.cpp
parent0f50e3c74ab7689046d24f86d8a9b24d68c37bb4 (diff)
downloadATCD-aaf7cb179cc4d72822c0a34ec6c9c605674b3a69.tar.gz
Wed May 14 18:14:15 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'ACE/ace/Sock_Connect.cpp')
-rw-r--r--ACE/ace/Sock_Connect.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/ACE/ace/Sock_Connect.cpp b/ACE/ace/Sock_Connect.cpp
index a24ba1f63fd..a182f5a714c 100644
--- a/ACE/ace/Sock_Connect.cpp
+++ b/ACE/ace/Sock_Connect.cpp
@@ -1153,7 +1153,7 @@ get_ip_interfaces_aix (size_t &count,
return 0;
}
-#elif defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x600)
+#elif defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x600) && !defined (ACE_HAS_VXWORKS551_MEDUSA)
int
get_ip_interfaces_vxworks_lt600 (size_t &count,
ACE_INET_Addr *&addrs)
@@ -1234,7 +1234,7 @@ ACE::get_ip_interfaces (size_t &count,
return get_ip_interfaces_hpux (count, addrs);
#elif defined (_AIX)
return get_ip_interfaces_aix (count, addrs);
-#elif defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x600)
+#elif defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x600) && !defined (ACE_HAS_VXWORKS551_MEDUSA)
return get_ip_interfaces_vxworks_lt600 (count, addrs);
#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