diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-09-05 11:48:42 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2019-09-11 09:42:19 -0400 |
| commit | 4b92f4c83a27149696e148412e09ae814f96b2eb (patch) | |
| tree | 0e31345075ec281645f22424d10e1db84a906686 /src/lib/conf | |
| parent | c650ab8061202cdccb5361b4bf9c53836c46d03a (diff) | |
| download | tor-4b92f4c83a27149696e148412e09ae814f96b2eb.tar.gz tor-4b92f4c83a27149696e148412e09ae814f96b2eb.zip | |
Re-number VTFLAG_* values so they don't conflict with CVFLAG_*
Diffstat (limited to 'src/lib/conf')
| -rw-r--r-- | src/lib/conf/conftypes.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/conf/conftypes.h b/src/lib/conf/conftypes.h index 6d1ce967a8..290b5831e5 100644 --- a/src/lib/conf/conftypes.h +++ b/src/lib/conf/conftypes.h @@ -153,20 +153,20 @@ typedef struct struct_magic_decl_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) +#define VTFLAG_UNSETTABLE (1u<<3) /** * 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) +#define VTFLAG_CONTAINED (1u<<4) /** * 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) +#define VTFLAG_CUMULATIVE (1u<<5) /** A variable allowed in the configuration file or on the command line. */ typedef struct config_var_t { |