瀏覽代碼

Remove compat.h as unneeded from log.c and torlog.h

Nick Mathewson 5 年之前
父節點
當前提交
0932f32291
共有 3 個文件被更改,包括 5 次插入3 次删除
  1. 1 1
      src/common/log.c
  2. 3 1
      src/common/torlog.h
  3. 1 1
      src/common/util_format.c

+ 1 - 1
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"
 

+ 3 - 1
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

+ 1 - 1
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);
 }
-