mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-13 14:43:46 +01:00
Move config_var_t info conftypes.h
This commit is contained in:
parent
e8790971f6
commit
4d101b39d7
@ -32,19 +32,6 @@ typedef struct config_deprecation_t {
|
|||||||
* you can abbreviate <b>tok</b>s as <b>tok</b>". */
|
* you can abbreviate <b>tok</b>s as <b>tok</b>". */
|
||||||
#define PLURAL(tok) { #tok, #tok "s", 0, 0 }
|
#define PLURAL(tok) { #tok, #tok "s", 0, 0 }
|
||||||
|
|
||||||
/** A variable allowed in the configuration file or on the command line. */
|
|
||||||
typedef struct config_var_t {
|
|
||||||
struct_member_t member; /** A struct member corresponding to this
|
|
||||||
* variable. */
|
|
||||||
const char *initvalue; /**< String (or null) describing initial value. */
|
|
||||||
|
|
||||||
#ifdef TOR_UNIT_TESTS
|
|
||||||
/** Used for compiler-magic to typecheck the corresponding field in the
|
|
||||||
* corresponding struct. Only used in unit test mode, at compile-time. */
|
|
||||||
confparse_dummy_values_t var_ptr_dummy;
|
|
||||||
#endif
|
|
||||||
} config_var_t;
|
|
||||||
|
|
||||||
/* Macros to define extra members inside config_var_t fields, and at the
|
/* Macros to define extra members inside config_var_t fields, and at the
|
||||||
* end of a list of them.
|
* end of a list of them.
|
||||||
*/
|
*/
|
||||||
|
@ -136,4 +136,17 @@ typedef union {
|
|||||||
} confparse_dummy_values_t;
|
} confparse_dummy_values_t;
|
||||||
#endif /* defined(TOR_UNIT_TESTS) */
|
#endif /* defined(TOR_UNIT_TESTS) */
|
||||||
|
|
||||||
|
/** A variable allowed in the configuration file or on the command line. */
|
||||||
|
typedef struct config_var_t {
|
||||||
|
struct_member_t member; /** A struct member corresponding to this
|
||||||
|
* variable. */
|
||||||
|
const char *initvalue; /**< String (or null) describing initial value. */
|
||||||
|
|
||||||
|
#ifdef TOR_UNIT_TESTS
|
||||||
|
/** Used for compiler-magic to typecheck the corresponding field in the
|
||||||
|
* corresponding struct. Only used in unit test mode, at compile-time. */
|
||||||
|
confparse_dummy_values_t var_ptr_dummy;
|
||||||
|
#endif
|
||||||
|
} config_var_t;
|
||||||
|
|
||||||
#endif /* !defined(TOR_SRC_LIB_CONF_CONFTYPES_H) */
|
#endif /* !defined(TOR_SRC_LIB_CONF_CONFTYPES_H) */
|
||||||
|
Loading…
Reference in New Issue
Block a user