|
@@ -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
|