diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-10-09 12:42:09 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-10-22 09:32:13 -0400 |
| commit | 04a74d4aa7d990b03ea07182e86263ed1651db43 (patch) | |
| tree | d594c38b819146ee2f180cf2c482fb716bea4d78 /src/lib/conf | |
| parent | 3e41459dff9e62cabe2636eac61d19b32dd0a4e1 (diff) | |
| download | tor-04a74d4aa7d990b03ea07182e86263ed1651db43.tar.gz tor-04a74d4aa7d990b03ea07182e86263ed1651db43.zip | |
conftesting.h: when COCCI is defined, disable unhandled macros
Diffstat (limited to 'src/lib/conf')
| -rw-r--r-- | src/lib/conf/conftesting.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/conf/conftesting.h b/src/lib/conf/conftesting.h index a40c9bc97c..8f82b5bf18 100644 --- a/src/lib/conf/conftesting.h +++ b/src/lib/conf/conftesting.h @@ -12,7 +12,9 @@ #ifndef TOR_LIB_CONF_CONFTESTING_H #define TOR_LIB_CONF_CONFTESTING_H +#ifndef COCCI #ifdef TOR_UNIT_TESTS +#define USE_CONF_TESTING /** * Union used when building in test mode typechecking the members of a type * used with confparse.c. See CONF_CHECK_VAR_TYPE for a description of how @@ -41,12 +43,10 @@ typedef union { // XXXX this doesn't belong at this level of abstraction. struct routerset_t **ROUTERSET; } confparse_dummy_values_t; -#endif /* defined(TOR_UNIT_TESTS) */ /* Macros to define extra members inside config_var_t fields, and at the * end of a list of them. */ -#ifdef TOR_UNIT_TESTS /* This is a somewhat magic type-checking macro for users of confparse.c. * It initializes a union member "confparse_dummy_values_t.conftype" with * the address of a static member "tp_dummy.member". This @@ -72,9 +72,10 @@ typedef union { #define DUMMY_CONF_TEST_MEMBERS , .var_ptr_dummy={ .INT=NULL } #define DUMMY_TYPECHECK_INSTANCE(tp) \ static tp tp ## _dummy +#endif +#endif -#else /* !(defined(TOR_UNIT_TESTS)) */ - +#ifndef USE_CONF_TESTING #define CONF_TEST_MEMBERS(tp, conftype, member) /* Repeatedly declarable incomplete struct to absorb redundant semicolons */ #define DUMMY_TYPECHECK_INSTANCE(tp) \ |