From: Roger Dingledine <arma@torproject.org>
Date: Mon, 1 Sep 2008 21:16:07 +0000 (+0000)
Subject: remove some redundant includes. i expect the first one to be a problem
X-Git-Tag: tor-0.2.1.6-alpha~92
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9f823f54d506e616652e1af84af8d1fc1222daab;p=thirdparty%2Ftor.git

remove some redundant includes. i expect the first one to be a problem
for tas, but who knows.


svn:r16723
---

diff --git a/src/common/compat.c b/src/common/compat.c
index 59d85a41f8..ded66493c5 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -20,7 +20,6 @@ const char compat_c_id[] =
  */
 #define _GNU_SOURCE
 
-#include "orconfig.h"
 #include "compat.h"
 
 #ifdef MS_WINDOWS
@@ -32,9 +31,6 @@ const char compat_c_id[] =
 #ifdef HAVE_UNAME
 #include <sys/utsname.h>
 #endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -50,40 +46,28 @@ const char compat_c_id[] =
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
-#ifdef HAVE_SYS_RESOURCE_H
-#include <sys/resource.h>
-#endif
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
+
 #ifndef HAVE_GETTIMEOFDAY
 #ifdef HAVE_FTIME
 #include <sys/timeb.h>
 #endif
 #endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
+
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h> /* FreeBSD needs this to know what version it is */
 #endif
-#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <assert.h>
-#ifdef HAVE_PTHREAD_H
-#include <pthread.h>
-#endif
 #ifdef HAVE_SIGNAL_H
 #include <signal.h>
 #endif