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 294a1e7173089840c8a82bd48bb35c4300135e06..064ab324f861db84a7244d2d30fe62b6a58f8bd7 100644 (file)
--- 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 7e12fe76db994315d175b487fad7bed4d1d25d95..1d3107f39706c52c795ff53c5bbd19961e5ac19b 100644 (file)
--- 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