Commit b3c2b62a authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Make "common" no longer depend on or.h 


svn:r1466
parent cb07e2ad

src/common/crypto.c

+6 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
/* See LICENSE for licensing information */

/* $Id$ */



#include "../or/or.h"

#include "orconfig.h"



#include <string.h>
@@ -22,9 +22,14 @@ 
#include <stdio.h>

#include <limits.h>



#ifdef HAVE_CTYPE_H

#include <ctype.h>

#endif



#include "crypto.h"

#include "log.h"

#include "aes.h"

#include "util.h"



#ifdef MS_WINDOWS

#include <wincrypt.h>

src/common/fakepoll.c

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ 
#ifdef HAVE_STRING_H

#include <string.h>

#endif

#ifdef HAVE_SYS_TIME_H

#include <sys/time.h>

#endif

#if _MSC_VER > 1300

#include <winsock2.h>

#include <ws2tcpip.h>

src/common/log.c

+6 −1
Original line number Diff line number Diff line
@@ -2,8 +2,13 @@ 
/* See LICENSE for licensing information */

/* $Id$ */



#include "../or/or.h"

#include <stdarg.h>

#include <assert.h>

#include <stdlib.h>

#include "orconfig.h"

#include "./util.h"

#include "./log.h"





#ifdef MS_WINDOWS

#define vsnprintf _vsnprintf

src/common/tortls.c

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include "./tortls.h"

#include "./util.h"

#include "./log.h"

#include <string.h>



/* Copied from or.h */

#define LEGAL_NICKNAME_CHARACTERS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"

src/common/util.c

+41 −1
Original line number Diff line number Diff line
@@ -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