Eliminate compat.h

diff --git a/src/common/include.am b/src/common/include.am
index 899e76364fa1fcc38e4b76ecb6c049cc16b42c0e..7427c694454ff19d05a83e58a10a85c9d66d40b5 100644 (file)
--- a/src/common/include.am
+++ b/src/common/include.am
@@ -50,7 +50,6 @@ src_common_libor_event_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
 
 COMMONHEADERS = \
   src/common/address_set.h                     \
-  src/common/compat.h                          \
   src/common/compat_libevent.h                 \
   src/common/handles.h                         \
   src/common/procmon.h                         \

diff --git a/src/or/config.c b/src/or/config.c
index 458b6bae2a85914a110f5024570ab87d3376b030..e3a4faa311600dd1c131519bd0c84c2cc6eb0814 100644 (file)
--- 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 4e34af3054874dc71f1f76a63d6254e3b1ad1c41..763666d2fae989929629279c39189726d725e027 100644 (file)
--- 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 8100f3b734a7fa51bd1a9f8cb23cd7cbd0f8e925..34cf64f5c47d643c49e93db244984577d8e2ee9b 100644 (file)
--- 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 aab311e96ffd2c5d17945b5ad42d7d75e1ebb994..7319d2f8c4f6eb27f18974e2840afbc4497f7de2 100644 (file)
--- 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 e307dd1b54ae53c0eb59ed7aff65173cae11c9cb..785132c1748b83dfeb0635186e1629d7ac377075 100644 (file)
--- 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"

diff --git a/src/test/test-memwipe.c b/src/test/test-memwipe.c
index 16bb017c89ee7a67f036c952e59d0e16240243b0..552cbbc551fe4ca9522635a580243f93fd647847 100644 (file)
--- a/src/test/test-memwipe.c
+++ b/src/test/test-memwipe.c
@@ -8,7 +8,6 @@
 #include <stdlib.h>
 
 #include "lib/crypt_ops/crypto_util.h"
-#include "common/compat.h"
 #include "common/util.h"
 
 static unsigned fill_a_buffer_memset(void) __attribute__((noinline));

diff --git a/src/test/test-timers.c b/src/test/test-timers.c
index 70f07fba4717684923055df2932e1f2a6e33b952..f6ff9a5f806293791b9973a8bff49ca7a93c1c44 100644 (file)
--- a/src/test/test-timers.c
+++ b/src/test/test-timers.c
@@ -7,7 +7,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "common/compat.h"
 #include "common/compat_libevent.h"
 #include "lib/crypt_ops/crypto_rand.h"
 #include "common/timers.h"

diff --git a/src/test/test.h b/src/test/test.h
index 9abd46008d0aef3195143a0a7cbf7419139fc609..c231bc5f873b0dddabf0da92cbdc4d943666c670 100644 (file)
--- a/src/test/test.h
+++ b/src/test/test.h
@@ -13,7 +13,6 @@
 
 #define DEBUG_SMARTLIST 1
 
-#include "common/compat.h"
 #include "tinytest.h"
 #define TT_EXIT_TEST_FUNCTION STMT_BEGIN goto done; STMT_END
 #include "tinytest_macros.h"

diff --git a/src/test/test_crypto_openssl.c b/src/test/test_crypto_openssl.c
index a01de18a6e08db6e30cb236e2436ac9a40949c60..d443ba6fd0a5fa4634917eef7454b484f1074eea 100644 (file)
--- a/src/test/test_crypto_openssl.c
+++ b/src/test/test_crypto_openssl.c
@@ -10,7 +10,6 @@
 #include "lib/crypt_ops/crypto_rand.h"
 #include "common/util.h"
 #include "lib/encoding/binascii.h"
-#include "common/compat.h"
 #include "test/test.h"
 
 #include <openssl/evp.h>

diff --git a/src/test/test_hs_ntor_cl.c b/src/test/test_hs_ntor_cl.c
index 9b59f0ddb656f4bf0d062cecc68b85bce0020e51..5475f3b38ccb9836ccca4cba2c16d1f65cff36aa 100644 (file)
--- a/src/test/test_hs_ntor_cl.c
+++ b/src/test/test_hs_ntor_cl.c
@@ -15,7 +15,6 @@
 #define ONION_NTOR_PRIVATE
 #include "or/or.h"
 #include "common/util.h"
-#include "common/compat.h"
 #include "lib/crypt_ops/crypto.h"
 #include "lib/crypt_ops/crypto_curve25519.h"
 #include "or/hs_ntor.h"

diff --git a/src/test/test_link_handshake.c b/src/test/test_link_handshake.c
index 2650caf9506e47c5943c898f4743d046d51fefb9..ffb6c47b1e9e0e22c25d8f77358d2afc7bca3243 100644 (file)
--- a/src/test/test_link_handshake.c
+++ b/src/test/test_link_handshake.c
@@ -8,8 +8,6 @@
 #define TOR_CHANNEL_INTERNAL_
 #define TORTLS_PRIVATE
 
-#include "common/compat.h"
-
 #include "or/or.h"
 #include "or/config.h"
 #include "or/connection.h"
@@ -1581,4 +1579,3 @@ struct testcase_t link_handshake_tests[] = {
 
   END_OF_TESTCASES
 };
-

diff --git a/src/test/test_ntor_cl.c b/src/test/test_ntor_cl.c
index a10cd7e9b53789919fc3db8e76001fa4e53b74c9..75d5ccc126e033d1f487082b41caf41b6470dd62 100644 (file)
--- a/src/test/test_ntor_cl.c
+++ b/src/test/test_ntor_cl.c
@@ -8,7 +8,6 @@
 #define ONION_NTOR_PRIVATE
 #include "or/or.h"
 #include "common/util.h"
-#include "common/compat.h"
 #include "lib/crypt_ops/crypto.h"
 #include "lib/crypt_ops/crypto_curve25519.h"
 #include "or/onion_ntor.h"

diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c
index f1b9b99f58cf1dd76550d72a911537c871d31328..b456734684cd003c00fdc69e7f78844890b51a90 100644 (file)
--- a/src/test/test_tortls.c
+++ b/src/test/test_tortls.c
@@ -11,7 +11,7 @@
 #endif
 #include <math.h>
 
-#include "common/compat.h"
+#include "lib/cc/compat_compiler.h"
 
 /* Some versions of OpenSSL declare SSL_get_selected_srtp_profile twice in
  * srtp.h. Suppress the GCC warning so we can build with -Wredundant-decl. */
@@ -2839,4 +2839,3 @@ struct testcase_t tortls_tests[] = {
   LOCAL_TEST_CASE(context_init_one, 0),
   END_OF_TESTCASES
 };
-