Selaa lähdekoodia

Document winsock includes better

Nick Mathewson 5 vuotta sitten
vanhempi
commit
7acb8c8d18
2 muutettua tiedostoa jossa 4 lisäystä ja 2 poistoa
  1. 1 1
      src/lib/tls/tortls_nss.c
  2. 3 1
      src/lib/tls/tortls_openssl.c

+ 1 - 1
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

+ 3 - 1
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