aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/mingw-openssl098m3
-rw-r--r--src/common/tortls.c11
2 files changed, 14 insertions, 0 deletions
diff --git a/changes/mingw-openssl098m b/changes/mingw-openssl098m
new file mode 100644
index 000000000..b4199760b
--- /dev/null
+++ b/changes/mingw-openssl098m
@@ -0,0 +1,3 @@
+ o Minor features
+ - Build correctly on mingw with more recent version of OpenSSL 0.9.8.
+ Patch from mingw-san.
diff --git a/src/common/tortls.c b/src/common/tortls.c
index b3c91a6ca..7dfdca6af 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -21,6 +21,17 @@
#endif
#include <assert.h>
+#ifdef MS_WINDOWS /*wrkard for dtls1.h >= 0.9.8m of "#include <winsock.h>"*/
+ #define WIN32_WINNT 0x400
+ #define _WIN32_WINNT 0x400
+ #define WIN32_LEAN_AND_MEAN
+ #if defined(_MSC_VER) && (_MSC_VER < 1300)
+ #include <winsock.h>
+ #else
+ #include <winsock2.h>
+ #include <ws2tcpip.h>
+ #endif
+#endif
#include <openssl/ssl.h>
#include <openssl/ssl3.h>
#include <openssl/err.h>