summaryrefslogtreecommitdiff
path: root/ACE/ace/SOCK_Dgram_Mcast.cpp
diff options
context:
space:
mode:
authorocielliottc <elliottc@objectcomputing.com>2022-10-14 06:04:13 -0500
committerGitHub <noreply@github.com>2022-10-14 06:04:13 -0500
commitf4512003c2fd03a7471c98a3a56a36353bfef15d (patch)
treef8c6dc619c992de539da66ea23a6eaba85bb735b /ACE/ace/SOCK_Dgram_Mcast.cpp
parentf63ede24b58993e439c94cf8a3b01773debfba17 (diff)
parentdb4f0fb92002573b6b0c571d891ea9fe4e3706be (diff)
downloadATCD-f4512003c2fd03a7471c98a3a56a36353bfef15d.tar.gz
Merge pull request #1965 from DOCGroup/ocielliottc/a6t2-merge
Merged pull requests 1953 and 1955-1958
Diffstat (limited to 'ACE/ace/SOCK_Dgram_Mcast.cpp')
-rw-r--r--ACE/ace/SOCK_Dgram_Mcast.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/ACE/ace/SOCK_Dgram_Mcast.cpp b/ACE/ace/SOCK_Dgram_Mcast.cpp
index 4b669591a4f..1cfc23e8e47 100644
--- a/ACE/ace/SOCK_Dgram_Mcast.cpp
+++ b/ACE/ace/SOCK_Dgram_Mcast.cpp
@@ -18,7 +18,7 @@
#endif
#if defined (ACE_HAS_GETIFADDRS)
-# if defined (ACE_VXWORKS)
+# if defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x700)
# include /**/ <net/ifaddrs.h>
# else
# include /**/ <ifaddrs.h>