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.)

diff --git a/src/common/crypto.c b/src/common/crypto.c
index 4a61d3faf3de86c8469e6a6c456b9bd9b1e8d2c0..2927aa2b5b31f642372599a8822b094fd4b79c15 100644 (file)
--- 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 e5123732cf3e3a2a86300ad982345e6219595c50..1a1b2077cc6d0e8b1b1cc40c0c3b984da339cf09 100644 (file)
--- 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 edccb4bfa6b62f7db8016c26a40f46a3298042b1..83bff671aa91fdc970664035923d7cf6e8543408 100644 (file)
--- 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 0162e31f0165e883f38eba7b530afa081178cbda..613de1ab0345e77fa8a6570cd4767346e58b8119 100644 (file)
--- 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 6416dbfbb39bb68d62bfe08ce4bb4a6b8fd8f8ca..739f7332dff350e05d787d992c38a63a6c1185b9 100644 (file)
--- 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 2ae4cc22ec03f258fe4189a632ec2b068c335e58..9ade76397a21fef7e15651c1144257a3dafc7ddb 100644 (file)
--- 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 f12c3d8dd3fe926da90aae7114fb47cbce8d14ee..fe7f793dbba0df160be70825128a4ddd31728f45 100644 (file)
--- 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>