summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-08-04 06:16:23 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-08-04 06:16:23 +0000
commit82f319af620ae1e9c8b983d37b038b591575493c (patch)
tree3d254bb15ef6cf0240246eccfea371ea5d33ccaf /mplayer.c
parent2776119d831edac39c49094291d2ac11752512a2 (diff)
downloadmpv-82f319af620ae1e9c8b983d37b038b591575493c.tar.bz2
mpv-82f319af620ae1e9c8b983d37b038b591575493c.tar.xz
Change a bunch of X11-specific preprocessor directives.
Switch from a HAVE_ prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27409 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/mplayer.c b/mplayer.c
index 627d3940de..2abe64444b 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -58,7 +58,7 @@
#include "libvo/font_load.h"
#include "libvo/sub.h"
-#ifdef HAVE_X11
+#ifdef CONFIG_X11
#include "libvo/x11_common.h"
#endif
@@ -691,7 +691,7 @@ void exit_player_with_rc(const char* how, int rc){
#ifdef WIN32
timeEndPeriod(1);
#endif
-#ifdef HAVE_X11
+#ifdef CONFIG_X11
#ifdef CONFIG_GUI
if ( !use_gui )
#endif
@@ -2734,7 +2734,7 @@ if(!codecs_file || !parse_codec_cfg(codecs_file)){
printf("\n");
opt_exit = 1;
}
-#ifdef HAVE_X11
+#ifdef CONFIG_X11
if(vo_fstype_list && strcmp(vo_fstype_list[0],"help")==0){
fstype_help();
mp_msg(MSGT_FIXME, MSGL_FIXME, "\n");
@@ -3745,7 +3745,7 @@ if(!mpctx->sh_video) {
current_module="vo_check_events";
if (vo_config_count) mpctx->video_out->check_events();
-#ifdef HAVE_X11
+#ifdef CONFIG_X11
if (stop_xscreensaver) {
current_module = "stop_xscreensaver";
xscreensaver_heartbeat();