[tor-commits] [tor/master] Remove some duplicate includes

nickm at torproject.org nickm at torproject.org
Thu Nov 3 14:22:07 UTC 2011


commit 72d4d762c19a81a81574d7e09cd4b0e3af1e6dbc
Author: Andrea Gelmini <andrea.gelmini at gelma.net>
Date:   Tue Nov 1 15:00:37 2011 +0100

    Remove some duplicate includes
---
 src/common/compat.h  |    3 ---
 src/common/crypto.c  |    2 --
 src/common/mempool.c |    1 -
 src/or/eventdns.c    |    1 -
 4 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/src/common/compat.h b/src/common/compat.h
index 8e271ba..045f414 100644
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -45,9 +45,6 @@
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
diff --git a/src/common/crypto.c b/src/common/crypto.c
index 0763a2c..f2ef833 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -64,8 +64,6 @@
 #error "We require OpenSSL >= 0.9.7"
 #endif
 
-#include <openssl/engine.h>
-
 #ifdef ANDROID
 /* Android's OpenSSL seems to have removed all of its Engine support. */
 #define DISABLE_ENGINES
diff --git a/src/common/mempool.c b/src/common/mempool.c
index 30d7788..1462c5f 100644
--- a/src/common/mempool.c
+++ b/src/common/mempool.c
@@ -62,7 +62,6 @@
 
 #if 1
 /* Tor dependencies */
-#include "orconfig.h"
 #include "util.h"
 #include "compat.h"
 #include "torlog.h"
diff --git a/src/or/eventdns.c b/src/or/eventdns.c
index 7fe376b..29e2d3a 100644
--- a/src/or/eventdns.c
+++ b/src/or/eventdns.c
@@ -75,7 +75,6 @@
 #include <stdint.h>
 #endif
 #include <stdlib.h>
-#include <string.h>
 #include <errno.h>
 #include <assert.h>
 #ifdef HAVE_UNISTD_H





More information about the tor-commits mailing list