]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Document winsock includes better
authorNick Mathewson <nickm@torproject.org>
Tue, 4 Sep 2018 14:55:15 +0000 (10:55 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 4 Sep 2018 18:52:35 +0000 (14:52 -0400)
src/lib/tls/tortls_nss.c
src/lib/tls/tortls_openssl.c

index df430765ad659443c5b5d7535fe1335847b9182e..266455049ecdcd5b2c8316ff295c0998594ba9d6 100644 (file)
@@ -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
index d10e50a975bcf93e6a0e61b08fa697c80f52361c..6ff03ee81843b356c2a3d00a54024f172dc88fb8 100644 (file)
@@ -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