diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-05-07 14:38:26 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-05-07 14:38:26 -0400 |
| commit | 5ad72bc1f50253c7d080e5d1f8f254f01bb1f19b (patch) | |
| tree | 570d89c411b010b606db1752fc30426365faae34 /src | |
| parent | 17236a58429dab6bf0536a64b90c4ec7f25985b8 (diff) | |
| parent | 9326abe16ac720346885e0ac555d6625233e198c (diff) | |
| download | tor-5ad72bc1f50253c7d080e5d1f8f254f01bb1f19b.tar.gz tor-5ad72bc1f50253c7d080e5d1f8f254f01bb1f19b.zip | |
Merge remote-tracking branch 'catalyst-github/bug26036'
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/crypto.c | 6 | ||||
| -rw-r--r-- | 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 index e148878be0..052f31723b 100644 --- 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 index 5abf0b0968..df2e2f65d3 100644 --- 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. |