nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 12:23:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move some includes around to try to fix windows builds

Browse Source
This commit is contained in:
Nick Mathewson 2018-05-03 16:14:38 -04:00
parent bd153e4640
commit 2d07aef3cc
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/crypto_rand.c
View File

@ -14,13 +14,13 @@
#ifndef CRYPTO_RAND_PRIVATE #ifndef CRYPTO_RAND_PRIVATE
#define CRYPTO_RAND_PRIVATE #define CRYPTO_RAND_PRIVATE
#include "crypto_rand.h"
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
#include <wincrypt.h> #include <wincrypt.h>
#endif /* defined(_WIN32) */ #endif /* defined(_WIN32) */
#include "crypto_rand.h"
#include "container.h" #include "container.h"
#include "compat.h" #include "compat.h"
#include "compat_openssl.h" #include "compat_openssl.h"

4
src/common/crypto_util.c
View File

@ -13,14 +13,16 @@
#ifndef CRYPTO_UTIL_PRIVATE #ifndef CRYPTO_UTIL_PRIVATE
#define CRYPTO_UTIL_PRIVATE #define CRYPTO_UTIL_PRIVATE
#include "crypto_util.h"
#include <string.h> #include <string.h>
#ifdef _WIN32 #ifdef _WIN32
#include <winsock2.h>
#include <windows.h> #include <windows.h>
#include <wincrypt.h> #include <wincrypt.h>
#endif /* defined(_WIN32) */ #endif /* defined(_WIN32) */
#include "crypto_util.h"
#include "util.h" #include "util.h"
DISABLE_GCC_WARNING(redundant-decls) DISABLE_GCC_WARNING(redundant-decls)