summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-06-21 09:54:04 -0400
committerNick Mathewson <nickm@torproject.org>2018-06-21 10:47:11 -0400
commit275aff6917260209dc53e553d895ec886f6c8c52 (patch)
tree9121e4e54fc7286f90f67e9b364d41914bfc245d /src/common
parent2cfcb7b364541c27749ae0df73eabd7a56797f93 (diff)
downloadtor-275aff6917260209dc53e553d895ec886f6c8c52.tar.gz
tor-275aff6917260209dc53e553d895ec886f6c8c52.zip
Rectify include paths (automated)
Diffstat (limited to 'src/common')
-rw-r--r--src/common/compat_time.c2
-rw-r--r--src/common/log.c2
-rw-r--r--src/common/sandbox.c4
-rw-r--r--src/common/util.c2
-rw-r--r--src/common/util.h2
-rw-r--r--src/common/util_bug.c2
6 files changed, 7 insertions, 7 deletions
diff --git a/src/common/compat_time.c b/src/common/compat_time.c
index 913fa666e1..da323e55ac 100644
--- a/src/common/compat_time.c
+++ b/src/common/compat_time.c
@@ -34,7 +34,7 @@
#include <mach/mach_time.h>
#endif
-#include "common/torerr.h"
+#include "lib/err/torerr.h"
#include "common/torlog.h"
#include "common/util.h"
#include "common/container.h"
diff --git a/src/common/log.c b/src/common/log.c
index 6dba5bf4b0..928a3fba8a 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -34,7 +34,7 @@
#define LOG_PRIVATE
#include "common/torlog.h"
#include "common/container.h"
-#include "common/torerr.h"
+#include "lib/err/torerr.h"
#ifdef HAVE_ANDROID_LOG_H
#include <android/log.h>
diff --git a/src/common/sandbox.c b/src/common/sandbox.c
index 3679037f8d..4fc1327307 100644
--- a/src/common/sandbox.c
+++ b/src/common/sandbox.c
@@ -34,7 +34,7 @@
#include "common/sandbox.h"
#include "common/container.h"
-#include "common/torerr.h"
+#include "lib/err/torerr.h"
#include "common/torlog.h"
#include "common/torint.h"
#include "common/util.h"
@@ -80,7 +80,7 @@
defined(HAVE_BACKTRACE_SYMBOLS_FD) && defined(HAVE_SIGACTION)
#define USE_BACKTRACE
#define EXPOSE_CLEAN_BACKTRACE
-#include "common/backtrace.h"
+#include "lib/err/backtrace.h"
#endif /* defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE) && ... */
#ifdef USE_BACKTRACE
diff --git a/src/common/util.c b/src/common/util.c
index 664ab34d2a..de46cc7c87 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -21,7 +21,7 @@
#include "common/container.h"
#include "common/address.h"
#include "common/sandbox.h"
-#include "common/backtrace.h"
+#include "lib/err/backtrace.h"
#include "common/util_process.h"
#include "common/util_format.h"
diff --git a/src/common/util.h b/src/common/util.h
index a5e6c4d462..8761e455fd 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -22,7 +22,7 @@
/* for the correct alias to struct stat */
#include <sys/stat.h>
#endif
-#include "common/torerr.h"
+#include "lib/err/torerr.h"
#include "common/util_bug.h"
#ifndef O_BINARY
diff --git a/src/common/util_bug.c b/src/common/util_bug.c
index da34201c1e..5cfd00649f 100644
--- a/src/common/util_bug.c
+++ b/src/common/util_bug.c
@@ -10,7 +10,7 @@
#include "orconfig.h"
#include "common/util_bug.h"
#include "common/torlog.h"
-#include "common/backtrace.h"
+#include "lib/err/backtrace.h"
#include "common/container.h"
#ifdef __COVERITY__