summaryrefslogtreecommitdiffstats
path: root/mpcommon.c
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-07-30 13:44:59 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-07-30 13:44:59 +0000
commit3b31fa5717f26ac8de703ed2681c9e42ac181e60 (patch)
treea09e8cbd7701bdd7f63158f8219263493f1d1eee /mpcommon.c
parent1fdf02e6fbd896c8fcce03992ecdf36144d85714 (diff)
downloadmpv-3b31fa5717f26ac8de703ed2681c9e42ac181e60.tar.bz2
mpv-3b31fa5717f26ac8de703ed2681c9e42ac181e60.tar.xz
Rename two GUI-related preprocessor directives:
HAVE_NEW_GUI --> CONFIG_GUI, HAVE_GTK2_GUI --> CONFIG_GTK2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27375 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mpcommon.c')
-rw-r--r--mpcommon.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/mpcommon.c b/mpcommon.c
index 5150e4f5d1..135dd540bd 100644
--- a/mpcommon.c
+++ b/mpcommon.c
@@ -210,26 +210,26 @@ int select_audio(demuxer_t* demuxer, int audio_id, char* audio_lang)
/* Parse -noconfig common to both programs */
int disable_system_conf=0;
int disable_user_conf=0;
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
int disable_gui_conf=0;
-#endif /* HAVE_NEW_GUI */
+#endif /* CONFIG_GUI */
/* Disable all configuration files */
static void noconfig_all(void)
{
disable_system_conf = 1;
disable_user_conf = 1;
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
disable_gui_conf = 1;
-#endif /* HAVE_NEW_GUI */
+#endif /* CONFIG_GUI */
}
const m_option_t noconfig_opts[] = {
{"all", noconfig_all, CONF_TYPE_FUNC, CONF_GLOBAL|CONF_NOCFG|CONF_PRE_PARSE, 0, 0, NULL},
{"system", &disable_system_conf, CONF_TYPE_FLAG, CONF_GLOBAL|CONF_NOCFG|CONF_PRE_PARSE, 0, 1, NULL},
{"user", &disable_user_conf, CONF_TYPE_FLAG, CONF_GLOBAL|CONF_NOCFG|CONF_PRE_PARSE, 0, 1, NULL},
-#ifdef HAVE_NEW_GUI
+#ifdef CONFIG_GUI
{"gui", &disable_gui_conf, CONF_TYPE_FLAG, CONF_GLOBAL|CONF_NOCFG|CONF_PRE_PARSE, 0, 1, NULL},
-#endif /* HAVE_NEW_GUI */
+#endif /* CONFIG_GUI */
{NULL, NULL, 0, 0, 0, 0, NULL}
};