diff options
| author | Nick Mathewson <nickm@torproject.org> | 2009-10-11 23:30:19 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2009-10-11 23:30:19 -0400 |
| commit | da990d09c3b0bfd035b9c0f27ac6c84b7375a7c6 (patch) | |
| tree | 87c245ad4e4f890c1d6ec502c7727463f8a9ac60 /src/or | |
| parent | 9d6c79cbbbd21fe685de7cb45f98636dac2f0b36 (diff) | |
| parent | 1707b338ee481bafdff443f15c65f422e8065518 (diff) | |
| download | tor-da990d09c3b0bfd035b9c0f27ac6c84b7375a7c6.tar.gz tor-da990d09c3b0bfd035b9c0f27ac6c84b7375a7c6.zip | |
Merge commit 'public/android'
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/buffers.c | 2 | ||||
| -rw-r--r-- | src/or/eventdns.c | 1 | ||||
| -rw-r--r-- | src/or/or.h | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/src/or/buffers.c b/src/or/buffers.c index e5123732cf..1a1b2077cc 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -12,6 +12,8 @@ **/ #define BUFFERS_PRIVATE #include "or.h" +#include "../common/util.h" +#include "../common/log.h" #ifdef HAVE_UNISTD_H #include <unistd.h> #endif diff --git a/src/or/eventdns.c b/src/or/eventdns.c index edccb4bfa6..83bff671aa 100644 --- a/src/or/eventdns.c +++ b/src/or/eventdns.c @@ -31,6 +31,7 @@ */ #include "eventdns_tor.h" +#include "../common/util.h" #include <sys/types.h> /* #define NDEBUG */ diff --git a/src/or/or.h b/src/or/or.h index b11cc827fd..f0ea25e07e 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -82,7 +82,7 @@ #include "crypto.h" #include "tortls.h" -#include "log.h" +#include "../common/log.h" #include "compat.h" #include "container.h" #include "util.h" |