summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-01-09 23:44:03 (GMT)
committerTobias Markmann <tm@ayena.de>2016-01-11 09:22:54 (GMT)
commite314293415c9691bb98188b514f6b13e33994d86 (patch)
treed43dd1a39a0b4416a7d1fc8f901f711040c65dac /3rdParty/Boost/SConscript
parent1941a4b684f3c5f852eb94deac4550c0450fe1b9 (diff)
downloadswift-e314293415c9691bb98188b514f6b13e33994d86.zip
swift-e314293415c9691bb98188b514f6b13e33994d86.tar.bz2
Fix IPv6 DNS resolution issues on Windows
Use values instead of define names for _WIN32_WINNT and NTDDI_VERSION defined needed for Windows.h configuration. Using the names boost fails to correctly detect getaddrinfo() support on Windows. Only run IPv6 related test cases in DomainNameResolverTest on Windows, if test_ipv6=1 is passed to the scons arguments. This is because on Windows getaddrinfo() will not return IPv6 related results when called with the AF_UNSPEC hint, unless the Windows host has global IPv6 connectivity. Changed the BoostConnectionTest to time out and not endlessly wait on a response from the remote host. Test-Information: Ran the following test configurations: * (SUCCESS) On Windows 8 with HE.net IPv6 tunnel to provide full IPv6 connectiviy: scons.bat test=system test_ipv6=1 Swiften/QA/NetworkTest * (SUCCESS) On Windows 8 with HE.net IPv6 tunnel to provide full IPv6 connectiviy: scons.bat test=system Swiften/QA/NetworkTest * (EXPECTED FAIL) On Windows 8 with no IPv6 connectiviy: scons.bat test=system test_ipv6=1 Swiften/QA/NetworkTest * (SUCCESS) On Windows 8 with no IPv6 connectiviy: scons.bat test=system Swiften/QA/NetworkTest Change-Id: I5adcd28e09e22acf61f7cca40b614e71df75dd70
Diffstat (limited to '3rdParty/Boost/SConscript')
-rw-r--r--3rdParty/Boost/SConscript3
1 files changed, 2 insertions, 1 deletions
diff --git a/3rdParty/Boost/SConscript b/3rdParty/Boost/SConscript
index c1eac82..d56f5e3 100644
--- a/3rdParty/Boost/SConscript
+++ b/3rdParty/Boost/SConscript
@@ -40,7 +40,8 @@ elif env.get("BOOST_BUNDLED", False) :
"LIBS": ["Swiften_Boost"]
}
if env["PLATFORM"] == "win32" :
- env["BOOST_FLAGS"]["CPPDEFINES"] += [("_WIN32_WINNT", "_WIN32_WINNT_VISTA")]
+ # 0x0600 = _WIN32_WINNT_VISTA
+ env["BOOST_FLAGS"]["CPPDEFINES"] += [("_WIN32_WINNT", "0x0600")]
if env["PLATFORM"] == "cygwin" :
env["BOOST_FLAGS"]["CPPDEFINES"] += ["__USE_W32_SOCKETS"]
elif env["PLATFORM"] == "posix" :