summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-06-28 09:25:58 -0400
committerNick Mathewson <nickm@torproject.org>2018-06-28 09:25:58 -0400
commit38fd3e0df06f72b3b67dfeb1d2a2c1c90761e05e (patch)
treee7dd8797aea3d4483207a0fa73c4bde5ea2780e7
parenteee86e627b670b153bb5a0f41f9f8dfa4c378884 (diff)
downloadtor-38fd3e0df06f72b3b67dfeb1d2a2c1c90761e05e.tar.gz
tor-38fd3e0df06f72b3b67dfeb1d2a2c1c90761e05e.zip
Fix up the modules that include memarea.h (automated)
-rw-r--r--src/common/storagedir.c2
-rw-r--r--src/or/consdiff.c2
-rw-r--r--src/or/main.c2
-rw-r--r--src/or/parsecommon.h2
-rw-r--r--src/or/routerparse.c2
-rw-r--r--src/test/fuzz/fuzz_vrs.c2
-rw-r--r--src/test/test.c2
-rw-r--r--src/test/test_consdiff.c2
-rw-r--r--src/test/test_dir.c2
-rw-r--r--src/test/test_options.c2
-rw-r--r--src/test/test_util.c2
11 files changed, 11 insertions, 11 deletions
diff --git a/src/common/storagedir.c b/src/common/storagedir.c
index 53b785bcf1..7642fbbb8e 100644
--- a/src/common/storagedir.c
+++ b/src/common/storagedir.c
@@ -4,7 +4,7 @@
#include "lib/container/smartlist.h"
#include "common/compat.h"
#include "lib/encoding/confline.h"
-#include "common/memarea.h"
+#include "lib/memarea/memarea.h"
#include "lib/sandbox/sandbox.h"
#include "common/storagedir.h"
#include "lib/log/torlog.h"
diff --git a/src/or/consdiff.c b/src/or/consdiff.c
index 6d000997f9..88edda716e 100644
--- a/src/or/consdiff.c
+++ b/src/or/consdiff.c
@@ -40,7 +40,7 @@
#include "or/or.h"
#include "or/consdiff.h"
-#include "common/memarea.h"
+#include "lib/memarea/memarea.h"
#include "or/routerparse.h"
static const char* ns_diff_version = "network-status-diff-version 1";
diff --git a/src/or/main.c b/src/or/main.c
index 1c77cdfb56..f06905b7b4 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -110,7 +110,7 @@
#include "or/tor_api_internal.h"
#include "common/util_process.h"
#include "or/ext_orport.h"
-#include "common/memarea.h"
+#include "lib/memarea/memarea.h"
#include "lib/sandbox/sandbox.h"
#include <event2/event.h>
diff --git a/src/or/parsecommon.h b/src/or/parsecommon.h
index fc61c514a1..7fe192c2a5 100644
--- a/src/or/parsecommon.h
+++ b/src/or/parsecommon.h
@@ -10,7 +10,7 @@
#define TOR_PARSECOMMON_H
#include "lib/crypt_ops/crypto.h"
-#include "common/memarea.h"
+#include "lib/memarea/memarea.h"
struct smartlist_t;
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 8f5113f041..dfc298286b 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -62,7 +62,7 @@
#include "or/dirauth/shared_random.h"
#include "or/dirserv.h"
#include "or/entrynodes.h"
-#include "common/memarea.h"
+#include "lib/memarea/memarea.h"
#include "or/microdesc.h"
#include "or/networkstatus.h"
#include "or/parsecommon.h"
diff --git a/src/test/fuzz/fuzz_vrs.c b/src/test/fuzz/fuzz_vrs.c
index 8126f8e48f..0713f99c35 100644
--- a/src/test/fuzz/fuzz_vrs.c
+++ b/src/test/fuzz/fuzz_vrs.c
@@ -4,7 +4,7 @@
#define NETWORKSTATUS_PRIVATE
#include "or/or.h"
#include "or/routerparse.h"
-#include "common/memarea.h"
+#include "lib/memarea/memarea.h"
#include "or/microdesc.h"
#include "or/networkstatus.h"
diff --git a/src/test/test.c b/src/test/test.c
index 1a3f4f8eb2..8ce756492d 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -51,7 +51,7 @@ double fabs(double x);
#include "or/rendcache.h"
#include "test/test.h"
#include "or/main.h"
-#include "common/memarea.h"
+#include "lib/memarea/memarea.h"
#include "or/onion.h"
#include "or/onion_ntor.h"
#include "or/onion_fast.h"
diff --git a/src/test/test_consdiff.c b/src/test/test_consdiff.c
index e293866f3d..38947a225b 100644
--- a/src/test/test_consdiff.c
+++ b/src/test/test_consdiff.c
@@ -8,7 +8,7 @@
#include "test/test.h"
#include "or/consdiff.h"
-#include "common/memarea.h"
+#include "lib/memarea/memarea.h"
#include "test/log_test_helpers.h"
#define tt_str_eq_line(a,b) \
diff --git a/src/test/test_dir.c b/src/test/test_dir.c
index f98afcaa2c..2643161fcb 100644
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@ -30,7 +30,7 @@
#include "or/entrynodes.h"
#include "or/fp_pair.h"
#include "or/hibernate.h"
-#include "common/memarea.h"
+#include "lib/memarea/memarea.h"
#include "or/networkstatus.h"
#include "or/router.h"
#include "or/routerkeys.h"
diff --git a/src/test/test_options.c b/src/test/test_options.c
index 6f31d97673..5860bef7ac 100644
--- a/src/test/test_options.c
+++ b/src/test/test_options.c
@@ -16,7 +16,7 @@
#include "test/log_test_helpers.h"
#include "lib/sandbox/sandbox.h"
-#include "common/memarea.h"
+#include "lib/memarea/memarea.h"
#include "or/policies.h"
#include "test/test_helpers.h"
diff --git a/src/test/test_util.c b/src/test/test_util.c
index 0c2febd464..f1c2812f14 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -16,7 +16,7 @@
#include "or/control.h"
#include "lib/crypt_ops/crypto_rand.h"
#include "test/test.h"
-#include "common/memarea.h"
+#include "lib/memarea/memarea.h"
#include "common/util_process.h"
#include "test/log_test_helpers.h"
#include "lib/compress/compress_zstd.h"