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.) --- sub/sub.c | 1 - 1 file changed, 1 deletion(-) (limited to 'sub/sub.c') diff --git a/sub/sub.c b/sub/sub.c index 73b446cd91..fcfbca6954 100644 --- a/sub/sub.c +++ b/sub/sub.c @@ -65,7 +65,6 @@ static const const struct osd_style_opts osd_style_opts_def = { .margin_y = 10, }; -#undef OPT_BASE_STRUCT #define OPT_BASE_STRUCT struct osd_style_opts const struct m_sub_options osd_style_conf = { .opts = (m_option_t[]) { -- cgit v1.2.3