From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 16 Dec 2019 18:10:20 +0000 (-0500)
Subject: lib/conf: include torint.h in files that use it.
X-Git-Tag: tor-0.4.3.1-alpha~40^2~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=25354171b598653d5d6cb9cd80ea78d891144156;p=thirdparty%2Ftor.git

lib/conf: include torint.h in files that use it.

This frees us from some dependencies on include order.
---

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