generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-04 19:13:35 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #697 from pijyoi/master

Browse Source 
bugfixes for mingw compilation
This commit is contained in:
Ian Barber 2013-10-04 10:13:46 -07:00
commit 23e58e30d5
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/test_system.cpp
View File

@ -20,7 +20,7 @@
#include "testutil.hpp" #include "testutil.hpp"
#if defined (ZMQ_HAVE_WINDOWS) #if defined (ZMQ_HAVE_WINDOWS)
# include <WinSock2.h> # include <winsock2.h>
# include <stdexcept> # include <stdexcept>
#else #else
# include <sys/socket.h> # include <sys/socket.h>

4
tests/testutil.hpp
View File

@ -31,8 +31,10 @@
#include <string> #include <string>
#if defined _WIN32 #if defined _WIN32
# if defined _MSC_VER
# include <crtdbg.h> # include <crtdbg.h>
# pragma warning(disable:4996) # pragma warning(disable:4996)
# endif
#else #else
# include <unistd.h> # include <unistd.h>
# include <signal.h> # include <signal.h>
@ -249,10 +251,12 @@ void close_zero_linger (void *socket)
void setup_test_environment() void setup_test_environment()
{ {
#if defined _WIN32 #if defined _WIN32
# if defined _MSC_VER
_set_abort_behavior( 0, _WRITE_ABORT_MSG); _set_abort_behavior( 0, _WRITE_ABORT_MSG);
_CrtSetReportMode( _CRT_ASSERT, _CRTDBG_MODE_FILE ); _CrtSetReportMode( _CRT_ASSERT, _CRTDBG_MODE_FILE );
_CrtSetReportFile( _CRT_ASSERT, _CRTDBG_FILE_STDERR ); _CrtSetReportFile( _CRT_ASSERT, _CRTDBG_FILE_STDERR );
# endif # endif
#endif
} }
#endif #endif