commit 0932f322911f41e72b5155d06775658039814a39 Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 21 17:35:56 2018 -0400

Remove compat.h as unneeded from log.c and torlog.h --- src/common/log.c | 2 +- src/common/torlog.h | 4 +++- 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 f452c7413..bb4b1e121 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 66141ab0a..6814cc9d0 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 420d8a1a8..713e87129 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); } -