Opened 9 years ago

Closed 9 years ago

Last modified 7 years ago

#1709 closed defect (fixed)

Fix compilation with mingw and OpenSSL 0.9.8m+

Reported by: mingw-san Owned by: nickm
Priority: Medium Milestone: Tor: 0.2.2.x-final
Component: Core Tor/Tor Version: Tor: 0.2.2.14-alpha
Severity: Keywords: Windows OpenSSL compilation
Cc: Actual Points:
Parent ID: Points:
Reviewer: Sponsor:

Description

--- tortls.c.was Tue Jul 13 01:37:00 2010
+++ tortls.c Mon Jul 19 19:17:42 2010
@@ -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>

Child Tickets

Change History (4)

comment:1 Changed 9 years ago by nickm

Milestone: Tor: 0.2.2.x-final
Owner: set to nickm
Status: newaccepted

Looks fine to me. What name and email should I use to credit this? (If you want, I can credit it to "mingw-san" with no email address.)

[This should probably be applied to 0.2.1.x as well as 0.2.2.x.)

comment:2 Changed 9 years ago by mingw-san

credit to "mingw-san" could be ok.

comment:3 Changed 9 years ago by nickm

Resolution: fixed
Status: acceptedclosed

Patch merged as 856a36c43439da3478892758c0df777ac647d245 ; thanks!

comment:4 Changed 7 years ago by nickm

Component: Tor ClientTor
Note: See TracTickets for help on using tickets.