Merge pull request #2092 from bluca/xp_testutils_ipv6

Problem: testutil.hpp fails to build on Windows XP

Merge pull request #2092 from bluca/xp_testutils_ipv6
Problem: testutil.hpp fails to build on Windows XP
81fd4044 · Constantin Rack · GitHub · 5d1c75f0 · a9343dbb · 81fd4044
Commit 81fd4044 authored Aug 27, 2016 by Constantin Rack Committed by GitHub Aug 27, 2016
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

testutil.hpp tests/testutil.hpp +4 -0

No files found.
--- a/tests/testutil.hpp
+++ b/tests/testutil.hpp
@@ -331,6 +331,9 @@ msleep (int milliseconds)
 int
 is_ipv6_available(void)
 {
+#if defined (ZMQ_HAVE_WINDOWS) && (_WIN32_WINNT < 0x0600)
+    return 0;
+#else
    int rc, ipv6 = 1;
    struct sockaddr_in6 test_addr;

@@ -373,6 +376,7 @@ is_ipv6_available(void)
 #endif

    return ipv6;
+#endif // _WIN32_WINNT < 0x0600
 }

 #endif