diff options
| author | Nick Mathewson <nickm@torproject.org> | 2004-04-03 04:05:12 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2004-04-03 04:05:12 +0000 |
| commit | b3c2b62a14cdc6511b148dc048463674453b52fd (patch) | |
| tree | d6eae937e0cd1cd217dae34f1ccdcfc7557558d8 /src/common/util.c | |
| parent | cb07e2ad2762cb2d7a4800b4b140459a0822e531 (diff) | |
| download | tor-b3c2b62a14cdc6511b148dc048463674453b52fd.tar tor-b3c2b62a14cdc6511b148dc048463674453b52fd.tar.gz | |
Make "common" no longer depend on or.h
svn:r1466
Diffstat (limited to 'src/common/util.c')
| -rw-r--r-- | src/common/util.c | 42 |
1 files changed, 41 insertions, 1 deletions
diff --git a/src/common/util.c b/src/common/util.c index 7a9301efb..050340f18 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2,12 +2,52 @@ /* See LICENSE for licensing information */ /* $Id$ */ -#include "../or/or.h" +#include "orconfig.h" +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <assert.h> +#include "util.h" +#include "log.h" +#include "crypto.h" #include "../or/tree.h" #ifdef HAVE_UNAME #include <sys/utsname.h> #endif +#ifdef HAVE_CTYPE_H +#include <ctype.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_ARPA_INET_H +#include <arpa/inet.h> +#endif +#ifdef HAVE_ERRNO_H +#include <errno.h> +#endif +#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> /* Must be included before sys/stat.h for Ultrix */ +#endif +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif +#ifdef HAVE_SYS_STAT_H +#include <sys/stat.h> +#endif +#ifdef HAVE_SYS_FCNTL_H +#include <sys/fcntl.h> +#endif +#ifdef HAVE_PWD_H +#include <pwd.h> +#endif +#ifdef HAVE_GRP_H +#include <grp.h> +#endif /* used by inet_addr, not defined on solaris anywhere!? */ #ifndef INADDR_NONE |