commit 7acb8c8d1835f919fee09585c966dee837f2e9f6 parent 70c27b7e39b9437bf18c0342b15a5c6a3022e204 Author: Nick Mathewson <nickm@torproject.org> Date: Tue, 4 Sep 2018 10:55:15 -0400 Document winsock includes better Diffstat:
| M | src/lib/tls/tortls_nss.c | | | 2 | +- |
| M | src/lib/tls/tortls_openssl.c | | | 4 | +++- |
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/lib/tls/tortls_nss.c b/src/lib/tls/tortls_nss.c @@ -14,7 +14,7 @@ #define TORTLS_PRIVATE #define TOR_X509_PRIVATE -#ifdef _WIN32 /*wrkard for dtls1.h >= 0.9.8m of "#include <winsock.h>"*/ +#ifdef _WIN32 #include <winsock2.h> #include <ws2tcpip.h> #endif diff --git a/src/lib/tls/tortls_openssl.c b/src/lib/tls/tortls_openssl.c @@ -20,7 +20,9 @@ #define TORTLS_OPENSSL_PRIVATE #define TOR_X509_PRIVATE -#ifdef _WIN32 /*wrkard for dtls1.h >= 0.9.8m of "#include <winsock.h>"*/ +#ifdef _WIN32 + /* We need to include these here, or else the dtls1.h header will include + * <winsock.h> and mess things up, in at least some openssl versions. */ #include <winsock2.h> #include <ws2tcpip.h> #endif