summaryrefslogtreecommitdiff
path: root/ACE/ace/INET_Addr.cpp
diff options
context:
space:
mode:
authorHuang-Ming Huang <huangming.huang@gmail.com>2017-04-10 10:13:40 -0500
committerHuang-Ming Huang <huangming.huang@gmail.com>2017-04-10 10:13:40 -0500
commit468ec2564585dfe2f3ff4490b7ffc218a56d4210 (patch)
tree6b1f3d2b34d1d38bb63988fb895345f715e1e21b /ACE/ace/INET_Addr.cpp
parent020cfd8d8ffa71ec6169287dc2e98cc0d4f7e815 (diff)
parenta4d9ea706f600d4fba245dccdc7094d6a6108e5e (diff)
downloadATCD-468ec2564585dfe2f3ff4490b7ffc218a56d4210.tar.gz
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'ACE/ace/INET_Addr.cpp')
-rw-r--r--ACE/ace/INET_Addr.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/ACE/ace/INET_Addr.cpp b/ACE/ace/INET_Addr.cpp
index a964a032630..b51cfe9fa70 100644
--- a/ACE/ace/INET_Addr.cpp
+++ b/ACE/ace/INET_Addr.cpp
@@ -413,10 +413,10 @@ ACE_INET_Addr::set (u_short port_number,
// lookups from completing if there is no, or only a loopback, IPv6
// interface configured. See Bugzilla 4211 for more info.
- // Without AI_ALL, Windows machines exhibit inconsistent behaviors on
- // difference machines we have tested.
hints.ai_flags = AI_V4MAPPED;
#if defined(ACE_HAS_IPV6) && defined(AI_ALL)
+ // Without AI_ALL, Windows machines exhibit inconsistent behaviors on
+ // difference machines we have tested.
hints.ai_flags |= AI_ALL;
#endif