diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-06-29 11:15:42 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-06-29 12:21:52 -0400 |
| commit | 35e1c497aa54a22818552c9f3757067e381bb6bb (patch) | |
| tree | 7af8fdec825dafcf87c9f3b85d0d47ca2e0c6479 | |
| parent | 714788b19549ad2a1d8c064bc74678605b0aa78e (diff) | |
| download | tor-35e1c497aa54a22818552c9f3757067e381bb6bb.tar.gz tor-35e1c497aa54a22818552c9f3757067e381bb6bb.zip | |
Combine compat.h into util.h
This is now just a collection of frequently-used headers.
| -rw-r--r-- | src/common/compat.h | 20 | ||||
| -rw-r--r-- | src/common/util.h | 43 |
2 files changed, 29 insertions, 34 deletions
diff --git a/src/common/compat.h b/src/common/compat.h index eb47dcfdfc..b9e4af855d 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -6,24 +6,6 @@ #ifndef TOR_COMPAT_H #define TOR_COMPAT_H -#include "orconfig.h" -#include "lib/cc/torint.h" -#include "lib/testsupport/testsupport.h" -#include "lib/cc/compat_compiler.h" -#include "lib/arch/bytes.h" -#include "lib/time/compat_time.h" -#include "lib/string/compat_ctype.h" -#include "lib/string/compat_string.h" -#include "lib/string/printf.h" -#include "lib/net/socket.h" -#include "lib/net/ipv4.h" -#include "lib/net/ipv6.h" -#include "lib/net/resolve.h" -#include "lib/fs/files.h" -#include "lib/fs/mmap.h" -#include "lib/fs/userdb.h" -#include "lib/wallclock/timeval.h" -#include "lib/intmath/cmp.h" -#include "lib/thread/threads.h" +#include "common/util.h" #endif /* !defined(TOR_COMPAT_H) */ diff --git a/src/common/util.h b/src/common/util.h index 6132659e65..55eec2b8c9 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -12,28 +12,41 @@ #define TOR_UTIL_H #include "orconfig.h" +#include "lib/arch/bytes.h" +#include "lib/cc/compat_compiler.h" #include "lib/cc/torint.h" -#include "common/compat.h" #include "lib/ctime/di_ops.h" -#include "lib/testsupport/testsupport.h" +#include "lib/encoding/cstring.h" +#include "lib/encoding/time_fmt.h" #include "lib/err/torerr.h" -#include "lib/malloc/util_malloc.h" -#include "lib/wallclock/approx_time.h" -#include "lib/string/util_string.h" -#include "lib/string/parse_int.h" -#include "lib/string/scanf.h" -#include "lib/intmath/bits.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/intmath/cmp.h" +#include "lib/log/escape.h" #include "lib/log/ratelim.h" #include "lib/log/util_bug.h" -#include "lib/log/escape.h" -#include "lib/fs/dir.h" -#include "lib/fs/files.h" -#include "lib/fs/path.h" -#include "lib/encoding/time_fmt.h" -#include "lib/encoding/cstring.h" +#include "lib/malloc/util_malloc.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" #endif /* !defined(TOR_UTIL_H) */ |