diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-10-22 09:40:31 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-10-22 09:40:31 -0400 |
| commit | 931a5db2a7ded73ddd72cb6646b506d49782f3ec (patch) | |
| tree | 2f7d2e4850f2e8c698fdc53bded13c23704034cf /src/lib/conf | |
| parent | b2d487ae2249a307cd23255dbb1a22241eefd6ef (diff) | |
| download | tor-931a5db2a7ded73ddd72cb6646b506d49782f3ec.tar.gz tor-931a5db2a7ded73ddd72cb6646b506d49782f3ec.zip | |
Re-run make autostyle.
Diffstat (limited to 'src/lib/conf')
| -rw-r--r-- | src/lib/conf/confmacros.h | 2 | ||||
| -rw-r--r-- | src/lib/conf/conftesting.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/conf/confmacros.h b/src/lib/conf/confmacros.h index 6449458a10..67082454a2 100644 --- a/src/lib/conf/confmacros.h +++ b/src/lib/conf/confmacros.h @@ -21,7 +21,7 @@ **/ #define END_OF_CONFIG_VARS \ { .member = { .name = NULL } DUMMY_CONF_TEST_MEMBERS } -#endif +#endif /* !defined(COCCI) */ /** * Declare a config_var_t as a member named <b>membername</b> of the structure diff --git a/src/lib/conf/conftesting.h b/src/lib/conf/conftesting.h index 8f82b5bf18..dbfd564079 100644 --- a/src/lib/conf/conftesting.h +++ b/src/lib/conf/conftesting.h @@ -72,8 +72,8 @@ typedef union { #define DUMMY_CONF_TEST_MEMBERS , .var_ptr_dummy={ .INT=NULL } #define DUMMY_TYPECHECK_INSTANCE(tp) \ static tp tp ## _dummy -#endif -#endif +#endif /* defined(TOR_UNIT_TESTS) */ +#endif /* !defined(COCCI) */ #ifndef USE_CONF_TESTING #define CONF_TEST_MEMBERS(tp, conftype, member) @@ -82,6 +82,6 @@ typedef union { struct tor_semicolon_eater #define DUMMY_CONF_TEST_MEMBERS -#endif /* defined(TOR_UNIT_TESTS) */ +#endif /* !defined(USE_CONF_TESTING) */ #endif /* !defined(TOR_LIB_CONF_CONFTESTING_H) */ |