aboutsummaryrefslogtreecommitdiff
path: root/src/common/util.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2003-08-12 07:49:29 +0000
committerNick Mathewson <nickm@torproject.org>2003-08-12 07:49:29 +0000
commit9b12a484289be9278b20557cc29d5db2a75d1e30 (patch)
tree88b2cbad322e1415ab5bb63063c4dc45b93cdcc1 /src/common/util.c
parent2cb4f7a473a35792f4d7a951ac43bfab79abebec (diff)
downloadtor-9b12a484289be9278b20557cc29d5db2a75d1e30.tar
tor-9b12a484289be9278b20557cc29d5db2a75d1e30.tar.gz
Stop trying to #include the world in util.c
svn:r390
Diffstat (limited to 'src/common/util.c')
-rw-r--r--src/common/util.c36
1 files changed, 1 insertions, 35 deletions
diff --git a/src/common/util.c b/src/common/util.c
index 56d385129..c313fb5db 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -2,41 +2,7 @@
/* See LICENSE for licensing information */
/* $Id$ */
-#include "orconfig.h"
-
-#include <stdlib.h>
-#include <limits.h>
-#if _MSC_VER > 1300
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#elif defined(_MSC_VER)
-#include <winsock.h>
-#endif
-#ifdef HAVE_SYS_FCNTL_H
-#include <sys/fcntl.h>
-#endif
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <assert.h>
-#include <errno.h>
-#include <string.h>
-
+#include "../or/or.h"
#include "util.h"
#include "log.h"