aboutsummaryrefslogtreecommitdiff
path: root/src/lib/conf/conftesting.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-06-20 16:07:00 -0400
committerNick Mathewson <nickm@torproject.org>2019-06-25 12:51:25 -0400
commit5b252d31ede521bea53c690693a2ab3d74c8fef4 (patch)
treed94bb5170b846c5732d8defb9be8dae3d9bac012 /src/lib/conf/conftesting.h
parentc553750e32d1bf669a3e8308fa44319954a627ca (diff)
downloadtor-5b252d31ede521bea53c690693a2ab3d74c8fef4.tar.gz
tor-5b252d31ede521bea53c690693a2ab3d74c8fef4.zip
Add a "flags" member to config_var_t
Additionally, adjust the macros so that we can add new members like this more easily.
Diffstat (limited to 'src/lib/conf/conftesting.h')
-rw-r--r--src/lib/conf/conftesting.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/conf/conftesting.h b/src/lib/conf/conftesting.h
index f4aca442a2..a40c9bc97c 100644
--- a/src/lib/conf/conftesting.h
+++ b/src/lib/conf/conftesting.h
@@ -68,8 +68,8 @@ typedef union {
#define CONF_CHECK_VAR_TYPE(tp, conftype, member) \
{ . conftype = &tp ## _dummy . member }
#define CONF_TEST_MEMBERS(tp, conftype, member) \
- , CONF_CHECK_VAR_TYPE(tp, conftype, member)
-#define DUMMY_CONF_TEST_MEMBERS , { .INT=NULL }
+ , .var_ptr_dummy=CONF_CHECK_VAR_TYPE(tp, conftype, member)
+#define DUMMY_CONF_TEST_MEMBERS , .var_ptr_dummy={ .INT=NULL }
#define DUMMY_TYPECHECK_INSTANCE(tp) \
static tp tp ## _dummy