Skip to content

Commit

Permalink
Merge 9326abe into 2c5841a
Browse files Browse the repository at this point in the history
  • Loading branch information
tlyu committed May 7, 2018
2 parents 2c5841a + 9326abe commit f9b599e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 0 additions & 6 deletions src/common/crypto.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 6 additions & 0 deletions src/common/crypto_rand.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit f9b599e

Please sign in to comment.