Move config_var_t info conftypes.h

2 files changed, 13 insertions, 13 deletions

diff --git a/src/app/config/confparse.h b/src/app/config/confparse.h
index b91ea1c13d..f89ff3c214 100644
--- a/src/app/config/confparse.h
+++ b/src/app/config/confparse.h
@@ -32,19 +32,6 @@ typedef struct config_deprecation_t {
  * you can abbreviate <b>tok</b>s as <b>tok</b>". */
 #define PLURAL(tok) { #tok, #tok "s", 0, 0 }
 
-/** A variable allowed in the configuration file or on the command line. */
-typedef struct config_var_t {
-  struct_member_t member; /** A struct member corresponding to this
-                           * variable. */
-  const char *initvalue; /**< String (or null) describing initial value. */
-
-#ifdef TOR_UNIT_TESTS
-  /** Used for compiler-magic to typecheck the corresponding field in the
-   * corresponding struct. Only used in unit test mode, at compile-time. */
-  confparse_dummy_values_t var_ptr_dummy;
-#endif
-} config_var_t;
-
 /* Macros to define extra members inside config_var_t fields, and at the
  * end of a list of them.
  */
diff --git a/src/lib/conf/conftypes.h b/src/lib/conf/conftypes.h
index cddfeff2fd..5f13ec3de2 100644
--- a/src/lib/conf/conftypes.h
+++ b/src/lib/conf/conftypes.h
@@ -136,4 +136,17 @@ typedef union {
 } confparse_dummy_values_t;
 #endif /* defined(TOR_UNIT_TESTS) */
 
+/** A variable allowed in the configuration file or on the command line. */
+typedef struct config_var_t {
+  struct_member_t member; /** A struct member corresponding to this
+                           * variable. */
+  const char *initvalue; /**< String (or null) describing initial value. */
+
+#ifdef TOR_UNIT_TESTS
+  /** Used for compiler-magic to typecheck the corresponding field in the
+   * corresponding struct. Only used in unit test mode, at compile-time. */
+  confparse_dummy_values_t var_ptr_dummy;
+#endif
+} config_var_t;
+
 #endif /* !defined(TOR_SRC_LIB_CONF_CONFTYPES_H) */