From efd9eab3bded8a50effd339c209ecf9e93aa051d Mon Sep 17 00:00:00 2001 From: DeckerSU Date: Tue, 18 Sep 2018 03:04:59 +0300 Subject: [PATCH] fix win build of iguana: prevent winsock.h inclusion in dtls1.h --- OSlibs/win/mingw.h | 4 ++-- crypto777/OS_nonportable.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/OSlibs/win/mingw.h b/OSlibs/win/mingw.h index 2c35aa78c..5690d6f91 100755 --- a/OSlibs/win/mingw.h +++ b/OSlibs/win/mingw.h @@ -5,8 +5,8 @@ #include #define _USE_W32_SOCKETS 1 -#define WIN32_LEAN_AND_MEAN -#include +//#define WIN32_LEAN_AND_MEAN +//#include #include #define PTW32_STATIC_LIB #include "pthread.h" diff --git a/crypto777/OS_nonportable.c b/crypto777/OS_nonportable.c index ca3f90695..d46fb2b1b 100755 --- a/crypto777/OS_nonportable.c +++ b/crypto777/OS_nonportable.c @@ -26,10 +26,10 @@ * not from the mingw header, so we need to include the windows header * if we are compiling in windows 64bit */ -//#if defined(_M_X64) -//#define WIN32_LEAN_AND_MEAN -//#include -//#endif +#if defined(_M_X64) +#define WIN32_LEAN_AND_MEAN +#include +#endif #include "OS_portable.h"