Remove relative paths to header files.

The paths are already in the directory search path of the compiler therefore no
need to include them in the source code.

diff --git a/src/common/crypto.c b/src/common/crypto.c
index 218c7bea1ee988688164c9a19957ba9f4d39c21e..91c4025ac2cc8c87ff333fa1d8661466bcf2e4b2 100644 (file)
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -51,9 +51,9 @@
 
 #define CRYPTO_PRIVATE
 #include "crypto.h"
-#include "../common/torlog.h"
+#include "torlog.h"
 #include "aes.h"
-#include "../common/util.h"
+#include "util.h"
 #include "container.h"
 #include "compat.h"
 #include "sandbox.h"

diff --git a/src/common/tortls.c b/src/common/tortls.c
index 97a82bf6e12f0bd8f211661c1f18fb068fb5be08..32106eb2df27bce70ab8c98fc4f1dbfeca0f3512 100644 (file)
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -789,7 +789,7 @@ const char UNRESTRICTED_SERVER_CIPHER_LIST[] =
 /** List of ciphers that clients should advertise, omitting items that
  * our OpenSSL doesn't know about. */
 static const char CLIENT_CIPHER_LIST[] =
-#include "./ciphers.inc"
+#include "ciphers.inc"
   /* Tell it not to use SSLv2 ciphers, so that it can select an SSLv3 version
    * of any cipher we say. */
   "!SSLv2"
@@ -804,7 +804,7 @@ typedef struct cipher_info_t { unsigned id; const char *name; } cipher_info_t;
 static const cipher_info_t CLIENT_CIPHER_INFO_LIST[] = {
 #define CIPHER(id, name) { id, name },
 #define XCIPHER(id, name) { id, #name },
-#include "./ciphers.inc"
+#include "ciphers.inc"
 #undef CIPHER
 #undef XCIPHER
 };

diff --git a/src/ext/eventdns.c b/src/ext/eventdns.c
index 2b2988f1ec7cb849fad9bbd5faadc3663d8c60a1..a0c7ff29fa595199f7741c9d84d48a14f49e240d 100644 (file)
--- a/src/ext/eventdns.c
+++ b/src/ext/eventdns.c
@@ -37,7 +37,7 @@
  */
 
 #include "eventdns_tor.h"
-#include "../common/util.h"
+#include "util.h"
 #include <sys/types.h>
 /* #define NDEBUG */
 

diff --git a/src/or/buffers.c b/src/or/buffers.c
index be9974418d9e634fd78f332687aa436bce53897b..8ef3279fde82ada5c368dac5a420ffd62dd4e8ec 100644 (file)
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -20,8 +20,8 @@
 #include "control.h"
 #include "reasons.h"
 #include "ext_orport.h"
-#include "../common/util.h"
-#include "../common/torlog.h"
+#include "util.h"
+#include "torlog.h"
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

diff --git a/src/or/dns.c b/src/or/dns.c
index cc4a1694226583a990ec7399aaa7fc1fe0532eef..db77d207834c4bbb3b4f3bdfbb0a50b7736e9164 100644 (file)
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -24,7 +24,7 @@
 #include "relay.h"
 #include "router.h"
 #include "ht.h"
-#include "../common/sandbox.h"
+#include "sandbox.h"
 #ifdef HAVE_EVENT2_DNS_H
 #include <event2/event.h>
 #include <event2/dns.h>

diff --git a/src/or/main.c b/src/or/main.c
index e691c53b193acac184743964c5cf2b29426c5171..28adbf8b711fb79cc8eb2bb96827f297b72b1d99 100644 (file)
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -63,7 +63,7 @@
 #include <openssl/crypto.h>
 #endif
 #include "memarea.h"
-#include "../common/sandbox.h"
+#include "sandbox.h"
 
 #ifdef HAVE_EVENT2_EVENT_H
 #include <event2/event.h>

diff --git a/src/or/or.h b/src/or/or.h
index 6723f93f77760eade6def70af92e59c845c59074..f75e7767302ed5f01f0f1db4731a02cb6fecd53b 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -88,7 +88,7 @@
 
 #include "crypto.h"
 #include "tortls.h"
-#include "../common/torlog.h"
+#include "torlog.h"
 #include "container.h"
 #include "torgzip.h"
 #include "address.h"

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index f4f6200bbc23e701618c03fd665ce4f080c860c3..98c3bb1831ccc378236336721155d99f39a928ec 100644 (file)
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -37,7 +37,7 @@
 #include "routerlist.h"
 #include "routerparse.h"
 #include "routerset.h"
-#include "../common/sandbox.h"
+#include "sandbox.h"
 // #define DEBUG_ROUTERLIST
 
 /****************************************************************************/

diff --git a/src/tools/tor-checkkey.c b/src/tools/tor-checkkey.c
index e404b682cfcbb6c0e283677a952d47d6dfa6a4c5..ed68bdf52cad6cc62a7f7765ae499dffc185bade 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 "torlog.h"
-#include "../common/util.h"
+#include "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 c599822e07d2bc9a025123b159d05ba78cced494..5ae155609a6f88e7fdabfe99d586d0dd6e95047c 100644 (file)
--- a/src/tools/tor-gencert.c
+++ b/src/tools/tor-gencert.c
@@ -28,8 +28,8 @@
 #endif
 
 #include "compat.h"
-#include "../common/util.h"
-#include "../common/torlog.h"
+#include "util.h"
+#include "torlog.h"
 #include "crypto.h"
 #include "address.h"
 

diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c
index 04815a63f703ed6879d3231dec875794dc10972a..19e3a554faffea480075cec193f0a1d425a1aa1b 100644 (file)
--- a/src/tools/tor-resolve.c
+++ b/src/tools/tor-resolve.c
@@ -5,9 +5,9 @@
 
 #include "orconfig.h"
 #include "compat.h"
-#include "../common/util.h"
+#include "util.h"
 #include "address.h"
-#include "../common/torlog.h"
+#include "torlog.h"
 #include "sandbox.h"
 
 #include <stdio.h>