Mercurial > mplayer.hg
diff libvo/vo_sdl.c @ 27377:d58d06eafe83
Change a bunch of X11-specific preprocessor directives.
Switch from a HAVE_ prefix to a CONFIG_ prefix.
author | diego |
---|---|
date | Mon, 04 Aug 2008 06:16:23 +0000 |
parents | 2a34d9fa52ab |
children | 8dec0335f75b |
line wrap: on
line diff
--- a/libvo/vo_sdl.c Sun Aug 03 20:17:46 2008 +0000 +++ b/libvo/vo_sdl.c Mon Aug 04 06:16:23 2008 +0000 @@ -70,7 +70,7 @@ #include "aspect.h" #include "libmpcodecs/vfcap.h" -#ifdef HAVE_X11 +#ifdef CONFIG_X11 #include <X11/Xlib.h> #include "x11_common.h" #endif @@ -1189,7 +1189,7 @@ } else if ( keypressed == SDLK_n ) { -#ifdef HAVE_X11 +#ifdef CONFIG_X11 aspect(&priv->dstwidth, &priv->dstheight,A_NOZOOM); #endif if (priv->surface->w != priv->dstwidth || priv->surface->h != priv->dstheight) { @@ -1523,7 +1523,7 @@ static void uninit(void) { -#ifdef HAVE_X11 +#ifdef CONFIG_X11 struct sdl_priv_s *priv = &sdl_priv; if(priv->X) { if( mp_msg_test(MSGT_VO,MSGL_V) ) { @@ -1599,7 +1599,7 @@ mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_SDL_UsingDriver, priv->driver); priv->X = 0; -#ifdef HAVE_X11 +#ifdef CONFIG_X11 if(vo_init()) { if( mp_msg_test(MSGT_VO,MSGL_V) ) { mp_msg(MSGT_VO,MSGL_V, "SDL: deactivating XScreensaver/DPMS\n"); }