[tor-commits] [tor/master] Move some includes around to try to fix windows builds

[nickm@xxxxxxxxxxxxxx]

commit 2d07aef3cc4ed21b7d66602912f74c287f5cb395
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu May 3 16:14:38 2018 -0400

    Move some includes around to try to fix windows builds
---
 src/common/crypto_rand.c | 4 ++--
 src/common/crypto_util.c | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/common/crypto_rand.c b/src/common/crypto_rand.c
index 66506235a..5abf0b096 100644
--- a/src/common/crypto_rand.c
+++ b/src/common/crypto_rand.c
@@ -14,13 +14,13 @@
 #ifndef CRYPTO_RAND_PRIVATE
 #define CRYPTO_RAND_PRIVATE
 
+#include "crypto_rand.h"
+
 #ifdef _WIN32
 #include <windows.h>
 #include <wincrypt.h>
 #endif /* defined(_WIN32) */
 
-#include "crypto_rand.h"
-
 #include "container.h"
 #include "compat.h"
 #include "compat_openssl.h"
diff --git a/src/common/crypto_util.c b/src/common/crypto_util.c
index c09afe6ee..b0d5b6b2f 100644
--- a/src/common/crypto_util.c
+++ b/src/common/crypto_util.c
@@ -13,14 +13,16 @@
 #ifndef CRYPTO_UTIL_PRIVATE
 #define CRYPTO_UTIL_PRIVATE
 
+#include "crypto_util.h"
+
 #include <string.h>
 
 #ifdef _WIN32
+#include <winsock2.h>
 #include <windows.h>
 #include <wincrypt.h>
 #endif /* defined(_WIN32) */
 
-#include "crypto_util.h"
 #include "util.h"
 
 DISABLE_GCC_WARNING(redundant-decls)

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