From c9088fff86068f3fc983ec6944e648cdc3ebe0a3 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 1 Mar 2013 11:27:59 +0100 Subject: m_option: don't define OPT_BASE_STRUCT by default OPT_BASE_STRUCT defines which struct the OPT_ macros (like OPT_INT etc.) reference implicitly, since these macros take struct member names but no struct type. Normally, only cfg-mplayer.h should need this, and other places shouldn't be bothered with having to #undef it. (Some files, like demux_lavf.c, still store their options in MPOpts. In the long term, this should be removed, and handled like e.g. with VO suboptions instead.) --- core/input/input.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'core/input/input.c') diff --git a/core/input/input.c b/core/input/input.c index 5d5e3f3a67..6419f28bc1 100644 --- a/core/input/input.c +++ b/core/input/input.c @@ -518,6 +518,8 @@ int async_quit_request; static int print_key_list(m_option_t *cfg, char *optname, char *optparam); static int print_cmd_list(m_option_t *cfg, char *optname, char *optparam); +#define OPT_BASE_STRUCT struct MPOpts + // Our command line options static const m_option_t input_conf[] = { OPT_STRING("conf", input.config_file, CONF_GLOBAL), -- cgit v1.2.3