Merge remote-tracking branch 'origin/issue-191' into issue-191

6 years ago · 1c29108390
3 changed files with 6 additions and 0 deletions
--- a/OSlibs/win/mingw.h
+++ b/OSlibs/win/mingw.h
@ -5,7 +5,11 @@
 #include <io.h>

 #define _USE_W32_SOCKETS 1
+
+#ifdef MM_WIN_BUILD
 #include <winsock2.h>
+#endif
+
 #include <windows.h>
 #define PTW32_STATIC_LIB
 #include "pthread.h"
--- a/crypto777/CMakeLists.txt
+++ b/crypto777/CMakeLists.txt
@ -7,5 +7,6 @@ if(WIN32)
 add_definitions(-DNATIVE_WINDOWS)
 add_definitions(-DIGUANA_LOG2PACKETSIZE=20)
 add_definitions(-DIGUANA_MAXPACKETSIZE=1572864)
+add_definitions(-DMM_WIN_BUILD)
 include_directories("${CMAKE_SOURCE_DIR}/includes")
 endif()
--- a/iguana/exchanges/CMakeLists.txt
+++ b/iguana/exchanges/CMakeLists.txt
@ -24,6 +24,7 @@ add_definitions(-DNATIVE_WINDOWS)
 add_definitions(-DIGUANA_LOG2PACKETSIZE=20)
 add_definitions(-DIGUANA_MAXPACKETSIZE=1572864)
 add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+add_definitions(-DMM_WIN_BUILD)
 include_directories("${CMAKE_SOURCE_DIR}/includes")
 endif()
 target_link_libraries(marketmaker-testnet ${MM_LIBS} etomiclib-testnet)