commit 25354171b598653d5d6cb9cd80ea78d891144156 Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 16 13:10:20 2019 -0500

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

This frees us from some dependencies on include order. --- src/lib/conf/confdecl.h | 1 + src/lib/conf/conftesting.h | 2 ++ 2 files changed, 3 insertions(+)

diff --git a/src/lib/conf/confdecl.h b/src/lib/conf/confdecl.h index 294a1e717..064ab324f 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 7e12fe76d..1d3107f39 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