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

Merge pull request #139 from t-b/bugfix/fix_compilation_on_windows

Browse Source 
Fix compilation on windows
This commit is contained in:
Luca Boccassi 2016-08-22 20:34:25 +01:00 committed by GitHub
commit aab1edfd7d
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/test_security_curve.cpp
View File

@ -245,7 +245,7 @@ int main (void)
ip4addr.sin_family = AF_INET;
ip4addr.sin_port = htons (9998);
#if (ZMQ_HAVE_WINDOWS and _WIN32_WINNT < 0x0600)
#if defined(ZMQ_HAVE_WINDOWS) && _WIN32_WINNT < 0x0600
ip4addr.sin_addr.s_addr = inet_addr ("127.0.0.1");
#else
inet_pton(AF_INET, "127.0.0.1", &ip4addr.sin_addr);

2
tests/test_security_null.cpp
View File

@ -158,7 +158,7 @@ int main (void)
ip4addr.sin_family = AF_INET;
ip4addr.sin_port = htons(9003);
#if (ZMQ_HAVE_WINDOWS and _WIN32_WINNT < 0x0600)
#if defined(ZMQ_HAVE_WINDOWS) && _WIN32_WINNT < 0x0600
ip4addr.sin_addr.s_addr = inet_addr ("127.0.0.1");
#else
inet_pton(AF_INET, "127.0.0.1", &ip4addr.sin_addr);

2
tests/test_security_plain.cpp
View File

@ -164,7 +164,7 @@ int main (void)
ip4addr.sin_family = AF_INET;
ip4addr.sin_port = htons (9998);
#if (ZMQ_HAVE_WINDOWS and _WIN32_WINNT < 0x0600)
#if defined(ZMQ_HAVE_WINDOWS) && _WIN32_WINNT < 0x0600
ip4addr.sin_addr.s_addr = inet_addr ("127.0.0.1");
#else
inet_pton(AF_INET, "127.0.0.1", &ip4addr.sin_addr);

2
tests/testutil.hpp
View File

@ -47,7 +47,7 @@
#include <string.h>
#if defined _WIN32
# include "windows.hpp"
# include "../src/windows.hpp"
# if defined _MSC_VER
# include <crtdbg.h>
# pragma warning(disable:4996)