Commit 3fc04529 authored by Nick Mathewson's avatar Nick Mathewson 🎨
Browse files

r14093@catbus: nickm | 2007-08-08 01:49:54 -0400

 Include fewer redundant headers; use the compiler search paths better.


svn:r11060
parent 50f5f636
......@@ -10,7 +10,7 @@ AM_CONFIG_HEADER(orconfig.h)
AC_CANONICAL_HOST
if test -f /etc/redhat-release ; then
CFLAGS="$CFLAGS -I/usr/kerberos/include"
CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include"
fi
AC_ARG_ENABLE(debug,
......
......@@ -14,7 +14,7 @@
* \brief Headers for aes.c
*/
#include "../common/torint.h"
#include "torint.h"
struct aes_cnt_cipher;
typedef struct aes_cnt_cipher aes_cnt_cipher_t;
......
......@@ -8,7 +8,6 @@
#define CONTAINER_H_ID \
"$Id$"
#include "compat.h"
#include "util.h"
/** A resizeable list of pointers, with associated helpful functionality.
......
......@@ -13,7 +13,7 @@
#ifndef __LOG_H
#define LOG_H_ID "$Id$"
#include "../common/compat.h"
#include "compat.h"
#ifdef HAVE_SYSLOG_H
#include <syslog.h>
......
......@@ -12,8 +12,6 @@
* \brief Macros used by unit tests.
*/
#include <string.h>
#include <stdio.h>
#include "compat.h"
#ifdef __GNUC__
......
......@@ -12,8 +12,8 @@
* \brief Headers for tortls.c
**/
#include "../common/crypto.h"
#include "../common/compat.h"
#include "crypto.h"
#include "compat.h"
/* Opaque structure to hold a TLS connection. */
typedef struct tor_tls_t tor_tls_t;
......
......@@ -17,12 +17,6 @@
#include "compat.h"
#include <stdio.h>
#include <stdlib.h>
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#ifdef HAVE_TIME_H
#include <time.h>
#endif
/* Replace assert() with a variant that sends failures to the log before
* calling assert() normally.
......
CPPFLAGS += -I../common
TESTS = test
noinst_PROGRAMS = test
......@@ -40,7 +42,7 @@ noinst_HEADERS = or.h eventdns.h eventdns_tor.h micro-revision.i
tor_main.o: micro-revision.i
micro-revision.i: FORCE
micro-revision.i:
@svkdir=$$SVKROOT; \
if test "x$$svkdir" = x ; then \
svkdir=$$HOME/.svk; \
......
......@@ -12,8 +12,7 @@ const char circuitlist_c_id[] =
**/
#include "or.h"
#include "../common/ht.h"
#include "ht.h"
/********* START VARIABLES **********/
......
......@@ -17,7 +17,6 @@ const char config_c_id[] = \
#ifdef MS_WINDOWS
#include <shlobj.h>
#endif
#include "../common/aes.h"
/** Enumeration of types which option values can take */
typedef enum config_type_t {
......@@ -4556,8 +4555,9 @@ getinfo_helper_config(control_connection_t *conn,
return 0;
}
#include "../common/ht.h"
#include "../common/test.h"
#include "aes.h"
#include "ht.h"
#include "test.h"
extern const char aes_c_id[];
extern const char compat_c_id[];
......
......@@ -14,7 +14,7 @@ const char dns_c_id[] =
**/
#include "or.h"
#include "../common/ht.h"
#include "ht.h"
#include "eventdns.h"
/** Longest hostname we're willing to resolve. */
......
......@@ -123,8 +123,8 @@ typedef int socklen_t;
#endif
/* XXXX020 These are for debugging possible memory leaks. */
#include "../common/util.h"
#include "../common/compat.h"
#include "util.h"
#include "compat.h"
#define malloc(x) tor_malloc(x)
#define realloc(x,y) tor_realloc((x),(y))
#define free(x) tor_free(x)
......
......@@ -10,7 +10,7 @@ typedef unsigned char u_char;
#ifdef MS_WINDOWS
#define inline __inline
#endif
#include "../common/torint.h"
#include "torint.h"
#if defined(MS_WINDOWS) && !defined(WIN32)
/* How did _this_ happen? */
......
......@@ -20,27 +20,27 @@
#define WIN32_LEAN_AND_MEAN
#endif
#include <stdio.h>
#include <stdlib.h>
// #include <stdio.h>
// #include <stdlib.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#ifdef HAVE_STRING_H
#include <string.h>
#endif
//#ifdef HAVE_STRING_H
//#include <string.h>
//#endif
#ifdef HAVE_SIGNAL_H
#include <signal.h>
#endif
#ifdef HAVE_NETDB_H
#include <netdb.h>
#endif
#ifdef HAVE_CTYPE_H
#include <ctype.h>
#endif
//#ifdef HAVE_CTYPE_H
//#include <ctype.h>
//#endif
#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h> /* FreeBSD needs this to know what version it is */
#endif
#include "../common/torint.h"
#include "torint.h"
#ifdef HAVE_SYS_WAIT_H
#include <sys/wait.h>
#endif
......@@ -53,21 +53,21 @@
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h>
#endif
#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
//#ifdef HAVE_SYS_SOCKET_H
//#include <sys/socket.h>
//#endif
#ifdef HAVE_SYS_UN_H
#include <sys/un.h>
#endif
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
//#ifdef HAVE_SYS_TIME_H
//#include <sys/time.h>
//#endif
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif
//#ifdef HAVE_NETINET_IN_H
//#include <netinet/in.h>
//#endif
#ifdef HAVE_ARPA_INET_H
#include <arpa/inet.h>
#endif
......@@ -91,6 +91,7 @@
#define MAXCONNECTIONS 15000
#endif
#if 0
#ifdef MS_WINDOWS
/* No, we don't need to redefine FD_SETSIZE before including winsock:
* we use libevent now, and libevent handles the select() stuff. Yes,
......@@ -107,6 +108,7 @@
#include <ws2tcpip.h>
#endif
#endif
#endif
#ifdef MS_WINDOWS
#include <io.h>
......@@ -118,13 +120,13 @@
#include <event.h>
#include "../common/crypto.h"
#include "../common/tortls.h"
#include "../common/log.h"
#include "../common/compat.h"
#include "../common/container.h"
#include "../common/util.h"
#include "../common/torgzip.h"
#include "crypto.h"
#include "tortls.h"
#include "log.h"
#include "compat.h"
#include "container.h"
#include "util.h"
#include "torgzip.h"
/* These signals are defined to help control_signal_act work.
*/
......
......@@ -13,7 +13,7 @@ const char relay_c_id[] =
**/
#include "or.h"
#include "../common/mempool.h"
#include "mempool.h"
static int relay_crypt(circuit_t *circ, cell_t *cell, int cell_direction,
crypt_path_t **layer_hint, char *recognized);
......
......@@ -36,9 +36,9 @@ const char tor_svn_revision[] = "";
#define ROUTER_PRIVATE
#include "or.h"
#include "../common/test.h"
#include "../common/torgzip.h"
#include "../common/mempool.h"
#include "test.h"
#include "torgzip.h"
#include "mempool.h"
int have_failed = 0;
......
CPPFLAGS += -I../common
bin_PROGRAMS = tor-resolve tor-gencert
tor_resolve_SOURCES = tor-resolve.c
......
......@@ -27,10 +27,10 @@
#define CRYPTO_PRIVATE
#include "../common/compat.h"
#include "../common/util.h"
#include "../common/log.h"
#include "../common/crypto.h"
#include "compat.h"
#include "util.h"
#include "log.h"
#include "crypto.h"
#define IDENTITY_KEY_BITS 3072
#define SIGNING_KEY_BITS 1024
......
......@@ -4,9 +4,9 @@
#include "orconfig.h"
#include "../common/compat.h"
#include "../common/util.h"
#include "../common/log.h"
#include "compat.h"
#include "util.h"
#include "log.h"
#include <stdio.h>
#include <stdlib.h>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment