Mercurial > mplayer.hg

diff mpcommon.c @ 26422:f74bff77f088

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
noconfig fix, disable_gui_conf was not defined when compiling mencoder. Fix mencoder linking when the GUI is enabled. Patch by Norman Yarvin (yarvin -at- yarchive -dot- net).
author albeu
date Tue, 15 Apr 2008 13:20:15 +0000
parents 9d53b15aed02
children e7c989f7a7c9
line wrap: on
line diff
--- a/mpcommon.c	Tue Apr 15 02:02:29 2008 +0000
+++ b/mpcommon.c	Tue Apr 15 13:20:15 2008 +0000
@@ -210,7 +210,9 @@
 /* Parse -noconfig common to both programs */
 int disable_system_conf=0;
 int disable_user_conf=0;
-extern int disable_gui_conf;
+#ifdef HAVE_NEW_GUI
+int disable_gui_conf=0;
+#endif /* HAVE_NEW_GUI */
 
 /* Disable all configuration files */
 static void noconfig_all(void)