From: mingw-san <mingw-san>
Date: Mon, 26 Jul 2010 19:05:11 +0000 (-0400)
Subject: Fix compilation with mingw and OpenSSL 0.9.8m+
X-Git-Tag: tor-0.2.2.15-alpha~66
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=856a36c43439da3478892758c0df777ac647d245;p=thirdparty%2Ftor.git

Fix compilation with mingw and OpenSSL 0.9.8m+
---

diff --git a/changes/mingw-openssl098m b/changes/mingw-openssl098m
new file mode 100644
index 0000000000..b4199760b7
--- /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 b3c91a6ca6..7dfdca6af9 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>