[tor-commits] [tor/master] Document winsock includes better

[nickm@xxxxxxxxxxxxxx]

commit 7acb8c8d1835f919fee09585c966dee837f2e9f6
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Sep 4 10:55:15 2018 -0400

    Document winsock includes better
---
 src/lib/tls/tortls_nss.c     | 2 +-
 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
index df430765a..266455049 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 d10e50a97..6ff03ee81 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



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits