diff options
| author | Nathan Freitas <nathan@freitas.net> | 2009-09-29 00:44:39 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2009-09-29 00:52:52 -0400 |
| commit | 8c585cce3987b04335acc6eebaa9ded3216b6e13 (patch) | |
| tree | c8da3fcd72333a5720d6de9d384e01e29f4185ba | |
| parent | 2e70642c3a5dfbbb76cd9d04351e54530646b19a (diff) | |
| download | tor-8c585cce3987b04335acc6eebaa9ded3216b6e13.tar tor-8c585cce3987b04335acc6eebaa9ded3216b6e13.tar.gz | |
Include util.h and log.h as relative paths.
This shouldn't be necessary, but apparently the Android cross-compiler
doesn't respect -I as well as it should. (-I is supposed to add to the
*front* of the search path. Android's gcc wrapper apparently likes to add to
the end. This is broken, but we need to work around it.)
| -rw-r--r-- | src/common/crypto.c | 4 | ||||
| -rw-r--r-- | src/or/buffers.c | 2 | ||||
| -rw-r--r-- | src/or/eventdns.c | 1 | ||||
| -rw-r--r-- | src/or/or.h | 2 | ||||
| -rw-r--r-- | src/tools/tor-checkkey.c | 2 | ||||
| -rw-r--r-- | src/tools/tor-gencert.c | 4 | ||||
| -rw-r--r-- | src/tools/tor-resolve.c | 4 |
7 files changed, 11 insertions, 8 deletions
diff --git a/src/common/crypto.c b/src/common/crypto.c index 4a61d3faf..2927aa2b5 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -50,9 +50,9 @@ #define CRYPTO_PRIVATE #include "crypto.h" -#include "log.h" +#include "../common/log.h" #include "aes.h" -#include "util.h" +#include "../common/util.h" #include "container.h" #include "compat.h" diff --git a/src/or/buffers.c b/src/or/buffers.c index e5123732c..1a1b2077c 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 edccb4bfa..83bff671a 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 0162e31f0..613de1ab0 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" diff --git a/src/tools/tor-checkkey.c b/src/tools/tor-checkkey.c index 6416dbfbb..739f7332d 100644 --- a/src/tools/tor-checkkey.c +++ b/src/tools/tor-checkkey.c @@ -7,7 +7,7 @@ #include <stdlib.h> #include "crypto.h" #include "log.h" -#include "util.h" +#include "../common/util.h" #include "compat.h" #include <openssl/bn.h> #include <openssl/rsa.h> diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c index 2ae4cc22e..9ade76397 100644 --- a/src/tools/tor-gencert.c +++ b/src/tools/tor-gencert.c @@ -27,8 +27,8 @@ #define CRYPTO_PRIVATE #include "compat.h" -#include "util.h" -#include "log.h" +#include "../common/util.h" +#include "../common/log.h" #include "crypto.h" #include "address.h" diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c index f12c3d8dd..fe7f793db 100644 --- a/src/tools/tor-resolve.c +++ b/src/tools/tor-resolve.c @@ -6,9 +6,9 @@ #include "orconfig.h" #include "compat.h" -#include "util.h" +#include "../common/util.h" #include "address.h" -#include "log.h" +#include "../common/log.h" #include <stdio.h> #include <stdlib.h> |