3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-27 15:27:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #140 from bluca/xp_testutils_ipv6

Browse Source 
Problem: testutil.hpp fails to build on Windows XP
This commit is contained in:
Constantin Rack 2016-08-27 18:31:54 +02:00 committed by GitHub
commit aac9e54f8d
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -3,6 +3,8 @@
* Fixed #2051 - getifaddrs can fail with ECONNREFUSED * Fixed #2051 - getifaddrs can fail with ECONNREFUSED
* Fixed #2091 - testutil.hpp fails to build on Windows XP
0MQ version 4.1.5 stable, released on 2016/06/17 0MQ version 4.1.5 stable, released on 2016/06/17
================================================ ================================================

4
tests/testutil.hpp
View File

@ -308,6 +308,9 @@ void msleep (int milliseconds)
int int
is_ipv6_available(void) is_ipv6_available(void)
{ {
#if defined (ZMQ_HAVE_WINDOWS) && (_WIN32_WINNT < 0x0600)
return 0;
#else
int rc, ipv6 = 1; int rc, ipv6 = 1;
struct sockaddr_in6 test_addr; struct sockaddr_in6 test_addr;
@ -350,6 +353,7 @@ is_ipv6_available(void)
#endif #endif
return ipv6; return ipv6;
#endif // _WIN32_WINNT < 0x0600
} }
#endif #endif