aboutsummaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-12-16 13:10:20 -0500
committerNick Mathewson <nickm@torproject.org>2020-01-09 07:30:35 -0500
commit25354171b598653d5d6cb9cd80ea78d891144156 (patch)
tree67d52a487181d0de9723d339ba285c07a97b5701 /src/lib
parent8d4b4aa932658f8123de1810f9c17f31594e8c1b (diff)
downloadtor-25354171b598653d5d6cb9cd80ea78d891144156.tar.gz
tor-25354171b598653d5d6cb9cd80ea78d891144156.zip
lib/conf: include torint.h in files that use it.
This frees us from some dependencies on include order.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/conf/confdecl.h1
-rw-r--r--src/lib/conf/conftesting.h2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/lib/conf/confdecl.h b/src/lib/conf/confdecl.h
index 294a1e7173..064ab324f8 100644
--- a/src/lib/conf/confdecl.h
+++ b/src/lib/conf/confdecl.h
@@ -51,6 +51,7 @@
#undef CONF_CONTEXT
#include "lib/cc/tokpaste.h"
+#include "lib/cc/torint.h"
/**
* Begin the definition of a configuration object called `name`.
diff --git a/src/lib/conf/conftesting.h b/src/lib/conf/conftesting.h
index 7e12fe76db..1d3107f397 100644
--- a/src/lib/conf/conftesting.h
+++ b/src/lib/conf/conftesting.h
@@ -12,6 +12,8 @@
#ifndef TOR_LIB_CONF_CONFTESTING_H
#define TOR_LIB_CONF_CONFTESTING_H
+#include "lib/cc/torint.h"
+
#ifndef COCCI
#ifdef TOR_UNIT_TESTS
#define USE_CONF_TESTING