Mercurial > mplayer.hg
diff m_option.h @ 34169:9b617726812c
Sanitize include behaviour.
The normal func_param argument type will iterate over all previous
values each time a new value is assigned.
This leads e.g. to a complete mess and non-working recursion limiting
when creating a config file that includes itself.
Seem to also fix bug #1994.
| author | reimar |
|---|---|
| date | Tue, 25 Oct 2011 20:18:35 +0000 |
| parents | 11d9ef2177ec |
| children | 87a1b3a11b33 |
line wrap: on
line diff
--- a/m_option.h Tue Oct 25 19:22:10 2011 +0000 +++ b/m_option.h Tue Oct 25 20:18:35 2011 +0000 @@ -62,6 +62,7 @@ // Func-based types extern const m_option_type_t m_option_type_func_full; extern const m_option_type_t m_option_type_func_param; +extern const m_option_type_t m_option_type_func_param_immediate; extern const m_option_type_t m_option_type_func; /// Callback used to reset func options. @@ -177,6 +178,7 @@ #define CONF_TYPE_STRING (&m_option_type_string) #define CONF_TYPE_FUNC (&m_option_type_func) #define CONF_TYPE_FUNC_PARAM (&m_option_type_func_param) +#define CONF_TYPE_FUNC_PARAM_IMMEDIATE (&m_option_type_func_param_immediate) #define CONF_TYPE_PRINT (&m_option_type_print) #define CONF_TYPE_PRINT_INDIRECT (&m_option_type_print_indirect) #define CONF_TYPE_PRINT_FUNC (&m_option_type_print_func)