diff options
author | Nick Mathewson <nickm@torproject.org> | 2018-05-03 16:14:38 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2018-05-03 16:14:38 -0400 |
commit | 2d07aef3cc4ed21b7d66602912f74c287f5cb395 (patch) | |
tree | 522124c8f330c7407dd3cf762f98ee2e2f29fc59 | |
parent | bd153e46408fa4f9432a5de1b1f5f106f00e34cf (diff) | |
download | tor-2d07aef3cc4ed21b7d66602912f74c287f5cb395.tar.gz tor-2d07aef3cc4ed21b7d66602912f74c287f5cb395.zip |
Move some includes around to try to fix windows builds
-rw-r--r-- | src/common/crypto_rand.c | 4 | ||||
-rw-r--r-- | 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 66506235a0..5abf0b0968 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 c09afe6eeb..b0d5b6b2f7 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) |