Rectify include paths (automated)

diff --git a/src/common/address.h b/src/common/address.h
index 2c9c620c2af0e9b1f25ee842b0767f26acfd7965..317c7f329cd15d730f24a0fa0eaa9dba1e3654d2 100644 (file)
--- a/src/common/address.h
+++ b/src/common/address.h
@@ -13,7 +13,7 @@
 
 //#include <sys/sockio.h>
 #include "orconfig.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/compat.h"
 #include "common/container.h"
 

diff --git a/src/common/address_set.h b/src/common/address_set.h
index f4986c9b024a4382e21119f7edaecf396b9bfdfc..cfee89cfb82f264aa9f973a25bbaa500579999a6 100644 (file)
--- a/src/common/address_set.h
+++ b/src/common/address_set.h
@@ -14,7 +14,7 @@
 #define TOR_ADDRESS_SET_H
 
 #include "orconfig.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 /**
  * An address_set_t represents a set of tor_addr_t values. The implementation

diff --git a/src/common/buffers.c b/src/common/buffers.c
index fd029c26c8a877b2725209a0b5c76461fb9e67a7..41f98ddf7c51ae1843c2e4e8794c82a38c02b01d 100644 (file)
--- a/src/common/buffers.c
+++ b/src/common/buffers.c
@@ -25,7 +25,7 @@
 #include "common/compat.h"
 #include "lib/compress/compress.h"
 #include "common/util.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/torlog.h"
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

diff --git a/src/common/buffers.h b/src/common/buffers.h
index 5cd9d3ec67278784b27753cc8451387ef5fed29b..5956e3484be33680614a68a746bb123e5415098b 100644 (file)
--- a/src/common/buffers.h
+++ b/src/common/buffers.h
@@ -13,7 +13,7 @@
 #define TOR_BUFFERS_H
 
 #include "common/compat.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/testsupport.h"
 
 typedef struct buf_t buf_t;

diff --git a/src/common/buffers_tls.c b/src/common/buffers_tls.c
index c380369b514c6864787b8fcc4da6cb07da0cf884..0a57b95529f8cbc7e7b43dce4988f70311cda919 100644 (file)
--- a/src/common/buffers_tls.c
+++ b/src/common/buffers_tls.c
@@ -12,7 +12,7 @@
 #include "common/compat.h"
 #include "lib/compress/compress.h"
 #include "common/util.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/torlog.h"
 #include "common/tortls.h"
 #ifdef HAVE_UNISTD_H

diff --git a/src/common/compat.h b/src/common/compat.h
index da9bd8bcc49c7c3b1eb513c68ef3a402add19416..0cc257fc9cd825465ebfaf7d11259af46025af39 100644 (file)
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -14,7 +14,7 @@
 #define SIO_IDEAL_SEND_BACKLOG_QUERY 0x4004747b
 #endif
 #endif
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/testsupport.h"
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
@@ -45,7 +45,7 @@
 #include <netinet6/in6.h>
 #endif
 
-#include "common/compat_compiler.h"
+#include "lib/cc/compat_compiler.h"
 #include "common/compat_time.h"
 
 #include <stdio.h>

diff --git a/src/common/compat_threads.h b/src/common/compat_threads.h
index 5d3883043d00aa34d2ccdb594f652ffc0c93bee3..ed0ece5ab90a186783040d59633ed0f5a3add245 100644 (file)
--- a/src/common/compat_threads.h
+++ b/src/common/compat_threads.h
@@ -7,7 +7,7 @@
 #define TOR_COMPAT_THREADS_H
 
 #include "orconfig.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/testsupport.h"
 
 #if defined(HAVE_PTHREAD_H) && !defined(_WIN32)

diff --git a/src/common/crypto.c b/src/common/crypto.c
index 57eb9c64c9af9e186c62660de994eae3c992b8de..8a8bb2b7700951b070b0cc7811c0fe592e2a0591 100644 (file)
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -63,7 +63,7 @@ ENABLE_GCC_WARNING(redundant-decls)
 #endif
 
 #include "common/torlog.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/aes.h"
 #include "common/util.h"
 #include "common/container.h"

diff --git a/src/common/crypto.h b/src/common/crypto.h
index e7d86eaf019bb14a6731779b2029cd1024e95f07..1324468097a9ece7f01588337154c7a399847f85 100644 (file)
--- a/src/common/crypto.h
+++ b/src/common/crypto.h
@@ -16,7 +16,7 @@
 #include "orconfig.h"
 
 #include <stdio.h>
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/compat.h"
 #include "common/util.h"
 #include "common/crypto_rsa.h"

diff --git a/src/common/crypto_curve25519.h b/src/common/crypto_curve25519.h
index 96d2e0e0728377a1749518c690475b76fe54e4f5..8a5b9b20186febe24d045bd23a081924c3a57557 100644 (file)
--- a/src/common/crypto_curve25519.h
+++ b/src/common/crypto_curve25519.h
@@ -5,7 +5,7 @@
 #define TOR_CRYPTO_CURVE25519_H
 
 #include "common/testsupport.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/crypto_digest.h"
 #include "common/crypto_openssl_mgt.h"
 

diff --git a/src/common/crypto_digest.h b/src/common/crypto_digest.h
index 25ca5ceda7002fb7b3a73d893844ed335744a8b8..96ac0385073a327a693782477af80bcd1d509221 100644 (file)
--- a/src/common/crypto_digest.h
+++ b/src/common/crypto_digest.h
@@ -16,7 +16,7 @@
 #include <stdio.h>
 
 #include "common/container.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 /** Length of the output of our message digest. */
 #define DIGEST_LEN 20

diff --git a/src/common/crypto_ed25519.h b/src/common/crypto_ed25519.h
index 20c04226e31a688e30a72e7413afffd323db4447..981b0dce2863081ab86df71a212b624878310f69 100644 (file)
--- a/src/common/crypto_ed25519.h
+++ b/src/common/crypto_ed25519.h
@@ -5,7 +5,7 @@
 #define TOR_CRYPTO_ED25519_H
 
 #include "common/testsupport.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/crypto_curve25519.h"
 #include "common/util.h"
 

diff --git a/src/common/crypto_format.h b/src/common/crypto_format.h
index 325b1ef44d10123a2d7ee26fdc4dab04ba6b888c..47f52b94b75cb2755cb8c7646e67b02572a88da4 100644 (file)
--- a/src/common/crypto_format.h
+++ b/src/common/crypto_format.h
@@ -8,7 +8,7 @@
 #define TOR_CRYPTO_FORMAT_H
 
 #include "common/testsupport.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/crypto_ed25519.h"
 
 int crypto_write_tagged_contents_to_file(const char *fname,

diff --git a/src/common/crypto_pwbox.h b/src/common/crypto_pwbox.h
index 2c73c700eb00a00704aa6cc5eece415f4a8a316f..9ed35a150e83f9eadabab4825889017b8f581a8e 100644 (file)
--- a/src/common/crypto_pwbox.h
+++ b/src/common/crypto_pwbox.h
@@ -4,7 +4,7 @@
 #ifndef CRYPTO_PWBOX_H_INCLUDED_
 #define CRYPTO_PWBOX_H_INCLUDED_
 
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 #define UNPWBOX_OKAY 0
 #define UNPWBOX_BAD_SECRET -1

diff --git a/src/common/crypto_rand.h b/src/common/crypto_rand.h
index 2e05adc93debea2f2f3ed374ba1f66fc6db7bf1a..8309bb21caeea76f7e663322abcd7abb7d8d2cc8 100644 (file)
--- a/src/common/crypto_rand.h
+++ b/src/common/crypto_rand.h
@@ -13,7 +13,7 @@
 #ifndef TOR_CRYPTO_RAND_H
 #define TOR_CRYPTO_RAND_H
 
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/util.h"
 
 /* random numbers */

diff --git a/src/common/crypto_rsa.h b/src/common/crypto_rsa.h
index c56eab319a958f6e6d73441ee335fabfd586f287..a80c46bb9f41f40f94e837524588f41ac2533abf 100644 (file)
--- a/src/common/crypto_rsa.h
+++ b/src/common/crypto_rsa.h
@@ -17,7 +17,7 @@
 
 #include "common/crypto_digest.h"
 #include <stdio.h>
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/testsupport.h"
 #include "common/compat.h"
 #include "common/util.h"

diff --git a/src/common/crypto_s2k.h b/src/common/crypto_s2k.h
index bc7224e8ead47475f5f555f4f34d9809763de303..b270897b6888c817d709045eeca8da2acbb5e417 100644 (file)
--- a/src/common/crypto_s2k.h
+++ b/src/common/crypto_s2k.h
@@ -8,7 +8,7 @@
 #define TOR_CRYPTO_S2K_H_INCLUDED
 
 #include <stdio.h>
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 /** Length of RFC2440-style S2K specifier: the first 8 bytes are a salt, the
  * 9th describes how much iteration to do. */

diff --git a/src/common/crypto_util.h b/src/common/crypto_util.h
index 53d9027fbca67d71a78bcd3ffe9b88608e37ef89..3ce34e6f230ed646681ab6f833c733ba16f0a8dc 100644 (file)
--- a/src/common/crypto_util.h
+++ b/src/common/crypto_util.h
@@ -13,7 +13,7 @@
 #ifndef TOR_CRYPTO_UTIL_H
 #define TOR_CRYPTO_UTIL_H
 
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 /** OpenSSL-based utility functions. */
 void memwipe(void *mem, uint8_t byte, size_t sz);

diff --git a/src/common/sandbox.c b/src/common/sandbox.c
index 4fc13273078030f691b05943b12f3d94250887bc..a33463f74bdef1e97195184beb1378c7c0f86086 100644 (file)
--- a/src/common/sandbox.c
+++ b/src/common/sandbox.c
@@ -36,7 +36,7 @@
 #include "common/container.h"
 #include "lib/err/torerr.h"
 #include "common/torlog.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/util.h"
 #include "tor_queue.h"
 

diff --git a/src/common/sandbox.h b/src/common/sandbox.h
index 945d57df7e3d7a03e13747870a7ddb3d2bb80109..f7c990e01352b8f2143e261fe4a6a21557cef9e1 100644 (file)
--- a/src/common/sandbox.h
+++ b/src/common/sandbox.h
@@ -13,7 +13,7 @@
 #define SANDBOX_H_
 
 #include "orconfig.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 #ifndef SYS_SECCOMP
 

diff --git a/src/common/token_bucket.h b/src/common/token_bucket.h
index 645c90c624292bda24a8ffd8ee3dcabc69f1e2f0..fd6834f26208a61d3cd6928d19a91727b7d8d51e 100644 (file)
--- a/src/common/token_bucket.h
+++ b/src/common/token_bucket.h
@@ -9,7 +9,7 @@
 #ifndef TOR_TOKEN_BUCKET_H
 #define TOR_TOKEN_BUCKET_H
 
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/testsupport.h"
 
 /** Largest allowable burst value for a token buffer. */

diff --git a/src/common/util.c b/src/common/util.c
index de46cc7c87b51c5320742975f34adff000ca3a0e..f9d64cfb90e7889f1022a2d6e0fbe6b9d194d853 100644 (file)
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -17,7 +17,7 @@
 #include "common/util.h"
 #include "common/torlog.h"
 #include "common/crypto_digest.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/container.h"
 #include "common/address.h"
 #include "common/sandbox.h"

diff --git a/src/common/util.h b/src/common/util.h
index b3c17db248d89dc2a0bfe8efa0ccb06e06e6ac68..cb8cefb12cd8d40768fb16b0d8bd72d76de548a8 100644 (file)
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -12,7 +12,7 @@
 #define TOR_UTIL_H
 
 #include "orconfig.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/compat.h"
 #include "lib/ctime/di_ops.h"
 #include "common/testsupport.h"

diff --git a/src/common/util_format.c b/src/common/util_format.c
index cab2572343bcf3a53da992a2c697e027b6e93da5..420d8a1a8f1fb9294488a3820dc4be4b8120897b 100644 (file)
--- a/src/common/util_format.c
+++ b/src/common/util_format.c
@@ -15,7 +15,7 @@
 #include "common/torlog.h"
 #include "common/util.h"
 #include "common/util_format.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 #include <stddef.h>
 #include <string.h>

diff --git a/src/common/util_format.h b/src/common/util_format.h
index 7dd5ae5bd881f2df0ad8fad99eb0475a6e84cfba..e49efd05c24d19b65c29a7e3b2ecdda14c3b590c 100644 (file)
--- a/src/common/util_format.h
+++ b/src/common/util_format.h
@@ -8,7 +8,7 @@
 #define TOR_UTIL_FORMAT_H
 
 #include "common/testsupport.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 /** @{ */
 /** These macros don't check for overflow.  Use them only for constant inputs

diff --git a/src/ext/OpenBSD_malloc_Linux.c b/src/ext/OpenBSD_malloc_Linux.c
index 157462b9acf60f579999fae502c7a786453cb8d4..9c30570c411808fcf849030eb37837d0de3878c1 100644 (file)
--- a/src/ext/OpenBSD_malloc_Linux.c
+++ b/src/ext/OpenBSD_malloc_Linux.c
@@ -59,7 +59,7 @@
 #include <errno.h>
 #include <err.h>
 /* For SIZE_MAX */
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 //#include "thread_private.h"
 

diff --git a/src/ext/csiphash.c b/src/ext/csiphash.c
index 36c3dee76e2b5b948d8da7bd72dd7f1a1a6414f8..f82e10b103afbf8294352ec369a052d58cbadff6 100644 (file)
--- a/src/ext/csiphash.c
+++ b/src/ext/csiphash.c
@@ -29,7 +29,7 @@
     Jean-Philippe Aumasson (https://131002.net/siphash/siphash24.c)
 */
 
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "siphash.h"
 /* for tor_assert */
 #include "common/util.h"

diff --git a/src/ext/curve25519_donna/curve25519-donna-c64.c b/src/ext/curve25519_donna/curve25519-donna-c64.c
index d2d7fb434a895cde54cce9203a31f0513d56e0df..45da7bf1e620b22f240a6d59892b2ecf5a3a0984 100644 (file)
--- a/src/ext/curve25519_donna/curve25519-donna-c64.c
+++ b/src/ext/curve25519_donna/curve25519-donna-c64.c
@@ -25,7 +25,7 @@
 #include "orconfig.h"
 
 #include <string.h>
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 typedef uint8_t u8;
 typedef uint64_t limb;

diff --git a/src/ext/curve25519_donna/curve25519-donna.c b/src/ext/curve25519_donna/curve25519-donna.c
index 573e6e26a985729ef8d443a26ae39aef19b3fa0f..d64b95c113523a8d7daef13c1c4303e6bd293d26 100644 (file)
--- a/src/ext/curve25519_donna/curve25519-donna.c
+++ b/src/ext/curve25519_donna/curve25519-donna.c
@@ -48,7 +48,7 @@
 #include "orconfig.h"
 
 #include <string.h>
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 typedef uint8_t u8;
 typedef int32_t s32;

diff --git a/src/ext/ed25519/donna/ed25519_donna_tor.h b/src/ext/ed25519/donna/ed25519_donna_tor.h
index dfaefc865888ce734bd0e39ba4ac8d510b59cdd4..20e9b5e99c52df028bc0f8023792f26fbd5601d6 100644 (file)
--- a/src/ext/ed25519/donna/ed25519_donna_tor.h
+++ b/src/ext/ed25519/donna/ed25519_donna_tor.h
@@ -1,7 +1,7 @@
 /* Added for Tor. */
 #ifndef SRC_EXT_ED25519_DONNA_H_INCLUDED_
 #define SRC_EXT_ED25519_DONNA_H_INCLUDED_
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 typedef unsigned char curved25519_key[32];
 

diff --git a/src/ext/ed25519/ref10/crypto_int32.h b/src/ext/ed25519/ref10/crypto_int32.h
index 59311a6201d7559a33a5ae9a1436dcd9eaf2c982..26271e917b637984d46b0347375212efac3cf41c 100644 (file)
--- a/src/ext/ed25519/ref10/crypto_int32.h
+++ b/src/ext/ed25519/ref10/crypto_int32.h
@@ -3,7 +3,7 @@
 #ifndef CRYPTO_INT32_H
 #define CRYPTO_INT32_H
 
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #define crypto_int32 int32_t
 #define crypto_uint32 uint32_t
 

diff --git a/src/ext/ed25519/ref10/crypto_int64.h b/src/ext/ed25519/ref10/crypto_int64.h
index 6dda30f2ed2dbee84644bc599fa647f2d9717c6d..3b066a9c0c058be3d793bb5c420a9891538233cb 100644 (file)
--- a/src/ext/ed25519/ref10/crypto_int64.h
+++ b/src/ext/ed25519/ref10/crypto_int64.h
@@ -3,7 +3,7 @@
 #ifndef CRYPTO_INT64_H
 #define CRYPTO_INT64_H
 
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #define crypto_int64 int64_t
 #define crypto_uint64 uint64_t
 

diff --git a/src/ext/ed25519/ref10/crypto_uint32.h b/src/ext/ed25519/ref10/crypto_uint32.h
index b12a595a107ca84423cfe3be1329f2d728114ab7..a7a77723bd5c59731de481d3a0aff962d36d8154 100644 (file)
--- a/src/ext/ed25519/ref10/crypto_uint32.h
+++ b/src/ext/ed25519/ref10/crypto_uint32.h
@@ -1,3 +1,3 @@
 /* Added for Tor. */
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #define crypto_uint32 uint32_t

diff --git a/src/ext/ed25519/ref10/crypto_uint64.h b/src/ext/ed25519/ref10/crypto_uint64.h
index 73edfd1b5e59c19ef39431fd6ec49f256b8e0a9b..adaaa080420dcded40171b3cff405fc09acf4f5a 100644 (file)
--- a/src/ext/ed25519/ref10/crypto_uint64.h
+++ b/src/ext/ed25519/ref10/crypto_uint64.h
@@ -1,3 +1,3 @@
 /* Added for Tor. */
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #define crypto_uint64 uint64_t

diff --git a/src/ext/ed25519/ref10/ed25519_ref10.h b/src/ext/ed25519/ref10/ed25519_ref10.h
index 15ac07e241e41e889b17920b2662df21c144ae43..bb72af6c0ba6be59da96ae77c3c08cf670abef41 100644 (file)
--- a/src/ext/ed25519/ref10/ed25519_ref10.h
+++ b/src/ext/ed25519/ref10/ed25519_ref10.h
@@ -1,7 +1,7 @@
 /* Added for Tor */
 #ifndef SRC_EXT_ED25519_REF10_H_INCLUDED_
 #define SRC_EXT_ED25519_REF10_H_INCLUDED_
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 int ed25519_ref10_seckey(unsigned char *sk);
 int ed25519_ref10_seckey_expand(unsigned char *sk, const unsigned char *sk_seed);

diff --git a/src/ext/keccak-tiny/keccak-tiny.h b/src/ext/keccak-tiny/keccak-tiny.h
index 58e1d4534237c2acfcee85365705c7e0a03eb91b..a9c8ed64205d677f073025889f495b3fd479d263 100644 (file)
--- a/src/ext/keccak-tiny/keccak-tiny.h
+++ b/src/ext/keccak-tiny/keccak-tiny.h
@@ -2,7 +2,7 @@
 #define KECCAK_FIPS202_H
 
 #include <stddef.h>
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 #define KECCAK_MAX_RATE 200
 

diff --git a/src/ext/mulodi/mulodi4.c b/src/ext/mulodi/mulodi4.c
index ddd17cd1dd17be18f7da10486483ae196d430220..accce1ce01638a683c3371a41fe92f0a00a9a9f1 100644 (file)
--- a/src/ext/mulodi/mulodi4.c
+++ b/src/ext/mulodi/mulodi4.c
@@ -18,7 +18,7 @@
 #define COMPILER_RT_ABI
 #define di_int int64_t
 #define di_uint uint64_t
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 di_int __mulodi4(di_int a, di_int b, int* overflow);
 #endif

diff --git a/src/lib/compress/compress.c b/src/lib/compress/compress.c
index 0d0c8112e2dac56396b78dfa5ac10c0aaad3031f..cb130b693b3746a84c1372c5de10e8e6e66fb890 100644 (file)
--- a/src/lib/compress/compress.c
+++ b/src/lib/compress/compress.c
@@ -13,7 +13,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>

diff --git a/src/lib/ctime/di_ops.h b/src/lib/ctime/di_ops.h
index 8298bfa73a9e57433be1b2ab5e4e0cae3d9a5b25..92af7ae27868f1976aad50fc5a8e33b0f4dceb1a 100644 (file)
--- a/src/lib/ctime/di_ops.h
+++ b/src/lib/ctime/di_ops.h
@@ -12,7 +12,7 @@
 #define TOR_DI_OPS_H
 
 #include "orconfig.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 
 int tor_memcmp(const void *a, const void *b, size_t sz);
 int tor_memeq(const void *a, const void *b, size_t sz);

diff --git a/src/lib/err/backtrace.h b/src/lib/err/backtrace.h
index 0a145fc92da1fb1663b068870dea3bddbe397568..7f77428436b0b1b8503227a69ea0b0ae7c8abd02 100644 (file)
--- a/src/lib/err/backtrace.h
+++ b/src/lib/err/backtrace.h
@@ -5,7 +5,7 @@
 #define TOR_BACKTRACE_H
 
 #include "orconfig.h"
-#include "common/compat_compiler.h"
+#include "lib/cc/compat_compiler.h"
 
 typedef void (*tor_log_fn)(int, unsigned, const char *fmt, ...)
   CHECK_PRINTF(3,4);

diff --git a/src/lib/err/torerr.h b/src/lib/err/torerr.h
index 10d9f481c08b841e3cf9ffc846e30460ab446432..d4bba6916fd2d9e0a0cb11df8acb1163bc93bb1a 100644 (file)
--- a/src/lib/err/torerr.h
+++ b/src/lib/err/torerr.h
@@ -13,7 +13,7 @@
 #ifndef TOR_TORERR_H
 #define TOR_TORERR_H
 
-#include "common/compat_compiler.h"
+#include "lib/cc/compat_compiler.h"
 
 /* The raw_assert...() variants are for use within code that can't call
  * tor_assertion_failed_() because of call circularity issues. */

diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 1af970040dc1ae8d9d7119385bca63c21944b172..9f64a1a20f4957e2456972825dd3c58991b14eff 100644 (file)
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -51,7 +51,7 @@
  * logic, which was originally circuit-focused.
  **/
 #define CIRCUITLIST_PRIVATE
-#include "common/torint.h"  /* TOR_PRIuSZ */
+#include "lib/cc/torint.h"  /* TOR_PRIuSZ */
 
 #include "or/or.h"
 #include "or/channel.h"

diff --git a/src/or/dir_server_st.h b/src/or/dir_server_st.h
index 8fdb04a7deb93b20dc274c7978bef1e33593372b..fe1f5c3d5f4e8bc7c232309691002bacc1d69ded 100644 (file)
--- a/src/or/dir_server_st.h
+++ b/src/or/dir_server_st.h
@@ -7,7 +7,7 @@
 #ifndef DIR_SERVER_ST_H
 #define DIR_SERVER_ST_H
 
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "or/or.h"
 #include "or/routerstatus_st.h"
 

diff --git a/src/or/entry_port_cfg_st.h b/src/or/entry_port_cfg_st.h
index 45dd844c46923ed90875813e76ae2780d7d8c204..9b07ccb067b569b84a1c2629ff7c78f35b037b14 100644 (file)
--- a/src/or/entry_port_cfg_st.h
+++ b/src/or/entry_port_cfg_st.h
@@ -7,7 +7,7 @@
 #ifndef ENTRY_PORT_CFG_ST_H
 #define ENTRY_PORT_CFG_ST_H
 
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "or/or.h"
 
 struct entry_port_cfg_t {

diff --git a/src/or/keypin.c b/src/or/keypin.c
index 921a401a4f15e8d934936aa810d43dcb08d4502c..17b5010fa56d3196917cd7021795f6b4241f6ae6 100644 (file)
--- a/src/or/keypin.c
+++ b/src/or/keypin.c
@@ -18,7 +18,7 @@
 #include "ht.h"
 #include "or/keypin.h"
 #include "siphash.h"
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/torlog.h"
 #include "common/util.h"
 #include "common/util_format.h"

diff --git a/src/or/onion_ntor.h b/src/or/onion_ntor.h
index 13a3298ac0d9b4938ec8e2376b635a74a3e9ef1d..0dd66f1e878c9b7e76cf45b341917ae15dd895cf 100644 (file)
--- a/src/or/onion_ntor.h
+++ b/src/or/onion_ntor.h
@@ -4,7 +4,7 @@
 #ifndef TOR_ONION_NTOR_H
 #define TOR_ONION_NTOR_H
 
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #include "common/crypto_curve25519.h"
 #include "lib/ctime/di_ops.h"
 

diff --git a/src/or/or.h b/src/or/or.h
index 66e69f3caaf9542f9ea3cfb21008e7c741d3ccca..53dc8960724e8bf3d2697c5b43987bb80e87772e 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -26,7 +26,7 @@
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h> /* FreeBSD needs this to know what version it is */
 #endif
-#include "common/torint.h"
+#include "lib/cc/torint.h"
 #ifdef HAVE_SYS_FCNTL_H
 #include <sys/fcntl.h>
 #endif