summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2007-08-08 05:50:31 +0000
committerNick Mathewson <nickm@torproject.org>2007-08-08 05:50:31 +0000
commit3fc04529d4178f9331f9fd22ff077501bddf251e (patch)
treed7fff8d4caf0ed0260fb1246cc884a128f6514a2 /src/common
parent50f5f6367854df38c7fa995aa778421b276177c1 (diff)
downloadtor-3fc04529d4178f9331f9fd22ff077501bddf251e.tar.gz
tor-3fc04529d4178f9331f9fd22ff077501bddf251e.zip
r14093@catbus: nickm | 2007-08-08 01:49:54 -0400
Include fewer redundant headers; use the compiler search paths better. svn:r11060
Diffstat (limited to 'src/common')
-rw-r--r--src/common/aes.h2
-rw-r--r--src/common/container.h1
-rw-r--r--src/common/log.h2
-rw-r--r--src/common/test.h2
-rw-r--r--src/common/tortls.h4
-rw-r--r--src/common/util.h6
6 files changed, 4 insertions, 13 deletions
diff --git a/src/common/aes.h b/src/common/aes.h
index 5dbd6f1f72..0962e7261b 100644
--- a/src/common/aes.h
+++ b/src/common/aes.h
@@ -14,7 +14,7 @@
* \brief Headers for aes.c
*/
-#include "../common/torint.h"
+#include "torint.h"
struct aes_cnt_cipher;
typedef struct aes_cnt_cipher aes_cnt_cipher_t;
diff --git a/src/common/container.h b/src/common/container.h
index 36df117666..2953b0d68f 100644
--- a/src/common/container.h
+++ b/src/common/container.h
@@ -8,7 +8,6 @@
#define CONTAINER_H_ID \
"$Id$"
-#include "compat.h"
#include "util.h"
/** A resizeable list of pointers, with associated helpful functionality.
diff --git a/src/common/log.h b/src/common/log.h
index e686140459..4a29375fa4 100644
--- a/src/common/log.h
+++ b/src/common/log.h
@@ -13,7 +13,7 @@
#ifndef __LOG_H
#define LOG_H_ID "$Id$"
-#include "../common/compat.h"
+#include "compat.h"
#ifdef HAVE_SYSLOG_H
#include <syslog.h>
diff --git a/src/common/test.h b/src/common/test.h
index 6919376d26..b6b10d4c22 100644
--- a/src/common/test.h
+++ b/src/common/test.h
@@ -12,8 +12,6 @@
* \brief Macros used by unit tests.
*/
-#include <string.h>
-#include <stdio.h>
#include "compat.h"
#ifdef __GNUC__
diff --git a/src/common/tortls.h b/src/common/tortls.h
index 00a57dfaec..7d69f8e6c4 100644
--- a/src/common/tortls.h
+++ b/src/common/tortls.h
@@ -12,8 +12,8 @@
* \brief Headers for tortls.c
**/
-#include "../common/crypto.h"
-#include "../common/compat.h"
+#include "crypto.h"
+#include "compat.h"
/* Opaque structure to hold a TLS connection. */
typedef struct tor_tls_t tor_tls_t;
diff --git a/src/common/util.h b/src/common/util.h
index 4837c172db..80d4aad743 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -17,12 +17,6 @@
#include "compat.h"
#include <stdio.h>
#include <stdlib.h>
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_TIME_H
-#include <time.h>
-#endif
/* Replace assert() with a variant that sends failures to the log before
* calling assert() normally.