commit c650ab8061202cdccb5361b4bf9c53836c46d03a Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 5 11:48:40 2019 -0400
Move VTFLAG_* declarations to conftypes.h --- src/lib/conf/conftypes.h | 19 +++++++++++++++++++ src/lib/confmgt/var_type_def_st.h | 19 ------------------- 2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/lib/conf/conftypes.h b/src/lib/conf/conftypes.h index 4609564b3..6d1ce967a 100644 --- a/src/lib/conf/conftypes.h +++ b/src/lib/conf/conftypes.h @@ -149,6 +149,25 @@ typedef struct struct_magic_decl_t { **/ #define CVFLAG_INVISIBLE (1u<<2)
+/** + * Flag for var_type_def_t. + * Set iff a variable of this type can never be set directly by name. + **/ +#define VTFLAG_UNSETTABLE (1u<<0) +/** + * Flag for var_type_def_t. + * Set iff a variable of this type is always contained in another + * variable, and as such doesn't need to be dumped or copied + * independently. + **/ +#define VTFLAG_CONTAINED (1u<<1) +/** + * Flag for var_type_def_t. + * Set iff a variable of this type can be set more than once without + * destroying older values. Such variables should implement "mark_fragile". + */ +#define VTFLAG_CUMULATIVE (1u<<2) + /** 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 diff --git a/src/lib/confmgt/var_type_def_st.h b/src/lib/confmgt/var_type_def_st.h index 5eb97cff1..f1131ff11 100644 --- a/src/lib/confmgt/var_type_def_st.h +++ b/src/lib/confmgt/var_type_def_st.h @@ -134,25 +134,6 @@ struct var_type_fns_t { };
/** - * Flag for var_type_def_t. - * Set iff a variable of this type can never be set directly by name. - **/ -#define VTFLAG_UNSETTABLE (1u<<0) -/** - * Flag for var_type_def_t. - * Set iff a variable of this type is always contained in another - * variable, and as such doesn't need to be dumped or copied - * independently. - **/ -#define VTFLAG_CONTAINED (1u<<1) -/** - * Flag for var_type_def_t. - * Set iff a variable of this type can be set more than once without - * destroying older values. Such variables should implement "mark_fragile". - */ -#define VTFLAG_CUMULATIVE (1u<<2) - -/** * A structure describing a type that can be manipulated with the typedvar_* * functions. **/