aboutsummaryrefslogtreecommitdiff
path: root/src/or/confparse.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-11-21 14:07:43 -0500
committerNick Mathewson <nickm@torproject.org>2017-11-21 14:07:43 -0500
commitbf882b037371d5ccb9eb1fc6c71199865169661b (patch)
tree39c2de688fc53f5af24ef89b425e8b7cbfd98461 /src/or/confparse.h
parent5da0a73838a210bac3be81baa9ade1d4ee7bf343 (diff)
downloadtor-bf882b037371d5ccb9eb1fc6c71199865169661b.tar.gz
tor-bf882b037371d5ccb9eb1fc6c71199865169661b.zip
re-run ./scripts/maint/annotate_ifdef_directives
Diffstat (limited to 'src/or/confparse.h')
-rw-r--r--src/or/confparse.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/confparse.h b/src/or/confparse.h
index 6f0b3b325c..022886e811 100644
--- a/src/or/confparse.h
+++ b/src/or/confparse.h
@@ -68,7 +68,7 @@ typedef union {
config_line_t **LINELIST_V;
routerset_t **ROUTERSET;
} confparse_dummy_values_t;
-#endif
+#endif /* defined(TOR_UNIT_TESTS) */
/** An abbreviation for a configuration option allowed on the command line. */
typedef struct config_abbrev_t {
@@ -132,13 +132,13 @@ typedef struct config_var_t {
{ NULL, CONFIG_TYPE_OBSOLETE, 0, NULL, { .INT=NULL } }
#define DUMMY_TYPECHECK_INSTANCE(tp) \
static tp tp ## _dummy
-#else
+#else /* !(defined(TOR_UNIT_TESTS)) */
#define CONF_TEST_MEMBERS(tp, conftype, member)
#define END_OF_CONFIG_VARS { NULL, CONFIG_TYPE_OBSOLETE, 0, NULL }
/* Repeatedly declarable incomplete struct to absorb redundant semicolons */
#define DUMMY_TYPECHECK_INSTANCE(tp) \
struct tor_semicolon_eater
-#endif
+#endif /* defined(TOR_UNIT_TESTS) */
/** Type of a callback to validate whether a given configuration is
* well-formed and consistent. See options_trial_assign() for documentation