From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 4 Sep 2018 14:55:15 +0000 (-0400)
Subject: Document winsock includes better
X-Git-Tag: tor-0.3.5.1-alpha~92^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7acb8c8d1835f919fee09585c966dee837f2e9f6;p=thirdparty%2Ftor.git

Document winsock includes better
---

diff --git a/src/lib/tls/tortls_nss.c b/src/lib/tls/tortls_nss.c
index df430765ad..266455049e 100644
--- 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
index d10e50a975..6ff03ee818 100644
--- 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