diff options
author | Nick Mathewson <nickm@torproject.org> | 2018-06-29 11:42:52 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2018-06-29 12:21:52 -0400 |
commit | 6ac64e16ed6958d1a5960c560254217478b7ad87 (patch) | |
tree | 735265160969e1d4353168742124427f56b0df30 /src/or | |
parent | 077176a34c54929580a0178ce6667ae180c352d1 (diff) | |
download | tor-6ac64e16ed6958d1a5960c560254217478b7ad87.tar.gz tor-6ac64e16ed6958d1a5960c560254217478b7ad87.zip |
Eliminate compat.h
Diffstat (limited to 'src/or')
-rw-r--r-- | src/or/config.c | 1 | ||||
-rw-r--r-- | src/or/directory.c | 1 | ||||
-rw-r--r-- | src/or/keypin.c | 1 | ||||
-rw-r--r-- | src/or/protover.h | 3 | ||||
-rw-r--r-- | src/or/torcert.c | 1 |
5 files changed, 3 insertions, 4 deletions
diff --git a/src/or/config.c b/src/or/config.c index 458b6bae2a..e3a4faa311 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -62,7 +62,6 @@ #define CONFIG_PRIVATE #include "or/or.h" #include "or/bridges.h" -#include "common/compat.h" #include "or/addressmap.h" #include "or/channel.h" #include "or/circuitbuild.h" diff --git a/src/or/directory.c b/src/or/directory.c index 4e34af3054..763666d2fa 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -17,7 +17,6 @@ #include "or/consdiff.h" #include "or/consdiffmgr.h" #include "or/control.h" -#include "common/compat.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" #include "or/directory.h" diff --git a/src/or/keypin.c b/src/or/keypin.c index 8100f3b734..34cf64f5c4 100644 --- a/src/or/keypin.c +++ b/src/or/keypin.c @@ -11,7 +11,6 @@ #define KEYPIN_PRIVATE #include "orconfig.h" -#include "common/compat.h" #include "lib/crypt_ops/crypto_digest.h" #include "lib/crypt_ops/crypto_format.h" #include "lib/ctime/di_ops.h" diff --git a/src/or/protover.h b/src/or/protover.h index aab311e96f..7319d2f8c4 100644 --- a/src/or/protover.h +++ b/src/or/protover.h @@ -9,6 +9,9 @@ #ifndef TOR_PROTOVER_H #define TOR_PROTOVER_H +#include <stdbool.h> +#include "lib/cc/torint.h" +#include "lib/testsupport/testsupport.h" struct smartlist_t; /** The first version of Tor that included "proto" entries in its diff --git a/src/or/torcert.c b/src/or/torcert.c index e307dd1b54..785132c174 100644 --- a/src/or/torcert.c +++ b/src/or/torcert.c @@ -32,7 +32,6 @@ #include "trunnel/ed25519_cert.h" #include "lib/log/torlog.h" #include "common/util.h" -#include "common/compat.h" #include "trunnel/link_handshake.h" #include "or/or_handshake_certs_st.h" |