diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-06-21 17:35:56 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-06-22 09:49:13 -0400 |
| commit | 0932f322911f41e72b5155d06775658039814a39 (patch) | |
| tree | 226490f91ad9dc77f494d7c4c04c210fc14aa667 | |
| parent | 9426751b72e922b5ee2b00bcc6158f5651a81014 (diff) | |
| download | tor-0932f322911f41e72b5155d06775658039814a39.tar.gz tor-0932f322911f41e72b5155d06775658039814a39.zip | |
Remove compat.h as unneeded from log.c and torlog.h
| -rw-r--r-- | src/common/log.c | 2 | ||||
| -rw-r--r-- | src/common/torlog.h | 4 | ||||
| -rw-r--r-- | src/common/util_format.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/common/log.c b/src/common/log.c index f452c7413a..bb4b1e1215 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -29,12 +29,12 @@ #ifdef HAVE_FCNTL_H #include <fcntl.h> #endif -#include "common/compat.h" #include "common/util.h" #define LOG_PRIVATE #include "common/torlog.h" #include "lib/container/smartlist.h" #include "lib/err/torerr.h" +#include "lib/malloc/util_malloc.h" #include "lib/wallclock/tor_gettimeofday.h" #include "lib/wallclock/approx_time.h" diff --git a/src/common/torlog.h b/src/common/torlog.h index 66141ab0ae..6814cc9d0b 100644 --- a/src/common/torlog.h +++ b/src/common/torlog.h @@ -12,7 +12,9 @@ #ifndef TOR_TORLOG_H -#include "common/compat.h" +#include <stdarg.h> +#include "lib/cc/torint.h" +#include "lib/cc/compat_compiler.h" #include "lib/testsupport/testsupport.h" #ifdef HAVE_SYSLOG_H diff --git a/src/common/util_format.c b/src/common/util_format.c index 420d8a1a8f..713e87129c 100644 --- a/src/common/util_format.c +++ b/src/common/util_format.c @@ -12,6 +12,7 @@ */ #include "orconfig.h" +#include <stddef.h> #include "common/torlog.h" #include "common/util.h" #include "common/util_format.h" @@ -532,4 +533,3 @@ base16_decode(char *dest, size_t destlen, const char *src, size_t srclen) return (int) (dest-dest_orig); } - |