Browse Source

Fix compilation with mingw and OpenSSL 0.9.8m+

mingw-san 13 years ago
parent
commit
78df6404eb
2 changed files with 14 additions and 0 deletions
  1. 3 0
      changes/mingw-openssl098m
  2. 11 0
      src/common/tortls.c

+ 3 - 0
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.

+ 11 - 0
src/common/tortls.c

@@ -17,6 +17,17 @@
 #include "orconfig.h"
 
 #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>