commit 5ad72bc1f50253c7d080e5d1f8f254f01bb1f19b parent 17236a58429dab6bf0536a64b90c4ec7f25985b8 Author: Nick Mathewson <nickm@torproject.org> Date: Mon, 7 May 2018 14:38:26 -0400 Merge remote-tracking branch 'catalyst-github/bug26036' Diffstat:
| M | src/common/crypto.c | | | 6 | ------ |
| M | src/common/crypto_rand.c | | | 6 | ++++++ |
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/common/crypto.c b/src/common/crypto.c @@ -60,12 +60,6 @@ ENABLE_GCC_WARNING(redundant-decls) #ifdef HAVE_UNISTD_H #include <unistd.h> #endif -#ifdef HAVE_SYS_SYSCALL_H -#include <sys/syscall.h> -#endif -#ifdef HAVE_SYS_RANDOM_H -#include <sys/random.h> -#endif #include "torlog.h" #include "torint.h" diff --git a/src/common/crypto_rand.c b/src/common/crypto_rand.c @@ -55,6 +55,12 @@ ENABLE_GCC_WARNING(redundant-decls) #ifdef HAVE_UNISTD_H #include <unistd.h> #endif +#ifdef HAVE_SYS_SYSCALL_H +#include <sys/syscall.h> +#endif +#ifdef HAVE_SYS_RANDOM_H +#include <sys/random.h> +#endif /** * How many bytes of entropy we add at once.