Commit 35e1c497 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Combine compat.h into util.h 

This is now just a collection of frequently-used headers.
parent 714788b1

src/common/compat.h

+1 −19
Original line number Diff line number Diff line
@@ -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) */

src/common/util.h

+28 −15
Original line number Diff line number Diff line
@@ -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) */