diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-07-05 15:04:18 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-07-05 15:04:18 -0400 |
| commit | 459382986102dd1bd84bca24a0fddfe04efefd76 (patch) | |
| tree | 2c0de91fc434a812acf9ce3bfccb93cb2f306fa2 /src/or/or.h | |
| parent | 0adcfbc7c8b579ebfe4c16c86700e8b466fc9a56 (diff) | |
| download | tor-459382986102dd1bd84bca24a0fddfe04efefd76.tar.gz tor-459382986102dd1bd84bca24a0fddfe04efefd76.zip | |
Remove util.h
Inline its contents (which were all includes) into or.h, and some of
its contents into other places that didn't include or.h at all.
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 38 |
1 files changed, 36 insertions, 2 deletions
diff --git a/src/or/or.h b/src/or/or.h index b0340ed1a0..826e81e468 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -22,14 +22,48 @@ #include <time.h> #endif -#include "common/util.h" - +#include "lib/arch/bytes.h" +#include "lib/cc/compat_compiler.h" +#include "lib/cc/torint.h" #include "lib/container/map.h" #include "lib/container/smartlist.h" #include "lib/crypt_ops/crypto.h" +#include "lib/ctime/di_ops.h" #include "lib/defs/dh_sizes.h" #include "lib/encoding/binascii.h" +#include "lib/encoding/cstring.h" +#include "lib/encoding/time_fmt.h" +#include "lib/err/torerr.h" +#include "lib/fs/dir.h" +#include "lib/fs/files.h" +#include "lib/fs/mmap.h" +#include "lib/fs/path.h" +#include "lib/fs/userdb.h" +#include "lib/intmath/addsub.h" +#include "lib/intmath/bits.h" +#include "lib/intmath/cmp.h" +#include "lib/intmath/logic.h" +#include "lib/intmath/muldiv.h" +#include "lib/log/escape.h" +#include "lib/log/ratelim.h" +#include "lib/log/util_bug.h" +#include "lib/malloc/util_malloc.h" #include "lib/net/address.h" +#include "lib/net/ipv4.h" +#include "lib/net/ipv6.h" +#include "lib/net/resolve.h" +#include "lib/net/socket.h" +#include "lib/string/compat_ctype.h" +#include "lib/string/compat_string.h" +#include "lib/string/parse_int.h" +#include "lib/string/printf.h" +#include "lib/string/scanf.h" +#include "lib/string/util_string.h" +#include "lib/testsupport/testsupport.h" +#include "lib/thread/threads.h" +#include "lib/time/compat_time.h" +#include "lib/wallclock/approx_time.h" +#include "lib/wallclock/timeval.h" #include "ht.h" |