From 82f319af620ae1e9c8b983d37b038b591575493c Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 4 Aug 2008 06:16:23 +0000 Subject: 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 --- gui/wm/ws.c | 20 ++++++++++---------- gui/wm/ws.h | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'gui/wm') diff --git a/gui/wm/ws.c b/gui/wm/ws.c index 34aa58c842..65ec992d58 100644 --- a/gui/wm/ws.c +++ b/gui/wm/ws.c @@ -48,15 +48,15 @@ #include "wsxdnd.h" #include -#ifdef HAVE_XSHAPE +#ifdef CONFIG_XSHAPE #include #endif -#ifdef HAVE_XINERAMA +#ifdef CONFIG_XINERAMA #include #endif -#ifdef HAVE_XF86VM +#ifdef CONFIG_XF86VM #include #endif @@ -235,7 +235,7 @@ wsXDNDInitialize(); mp_msg( MSGT_GPLAYER,MSGL_ERR,MSGTR_WS_NoXshm ); wsUseXShm=0; } -#ifdef HAVE_XSHAPE +#ifdef CONFIG_XSHAPE if ( !XShapeQueryExtension( wsDisplay,&eventbase,&errorbase ) ) { mp_msg( MSGT_GPLAYER,MSGL_ERR,MSGTR_WS_NoXshape ); @@ -249,7 +249,7 @@ wsXDNDInitialize(); wsScreen=DefaultScreen( wsDisplay ); wsRootWin=RootWindow( wsDisplay,wsScreen ); -#ifdef HAVE_XF86VM +#ifdef CONFIG_XF86VM { int clock; XF86VidModeModeLine modeline; @@ -278,7 +278,7 @@ wsXDNDInitialize(); int minor,major,shp; mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[ws] Screen depth: %d\n",wsDepthOnScreen ); mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[ws] size: %dx%d\n",wsMaxX,wsMaxY ); -#ifdef HAVE_XINERAMA +#ifdef CONFIG_XINERAMA mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[ws] origin: +%d+%d\n",wsOrgX,wsOrgY ); #endif mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[ws] red mask: 0x%x\n",wsRedMask ); @@ -289,7 +289,7 @@ wsXDNDInitialize(); XShmQueryVersion( wsDisplay,&major,&minor,&shp ); mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[ws] XShm version is %d.%d\n",major,minor ); } - #ifdef HAVE_XSHAPE + #ifdef CONFIG_XSHAPE if ( wsUseXShape ) { XShapeQueryVersion( wsDisplay,&major,&minor ); @@ -1220,7 +1220,7 @@ static int timeout_save=0; void wsScreenSaverOn( Display *mDisplay ) { int nothing; -#ifdef HAVE_XDPMS +#ifdef CONFIG_XDPMS if ( dpms_disabled ) { if ( DPMSQueryExtension( mDisplay,¬hing,¬hing ) ) @@ -1250,7 +1250,7 @@ void wsScreenSaverOn( Display *mDisplay ) void wsScreenSaverOff( Display * mDisplay ) { int interval,prefer_blank,allow_exp,nothing; -#ifdef HAVE_XDPMS +#ifdef CONFIG_XDPMS if ( DPMSQueryExtension( mDisplay,¬hing,¬hing ) ) { BOOL onoff; @@ -1273,7 +1273,7 @@ void wsScreenSaverOff( Display * mDisplay ) void wsSetShape( wsTWindow * win,char * data ) { -#ifdef HAVE_XSHAPE +#ifdef CONFIG_XSHAPE if ( !wsUseXShape ) return; if ( data ) { diff --git a/gui/wm/ws.h b/gui/wm/ws.h index e782edd6d3..73321c6ae9 100644 --- a/gui/wm/ws.h +++ b/gui/wm/ws.h @@ -27,7 +27,7 @@ #include #include #include -#ifdef HAVE_XDPMS +#ifdef CONFIG_XDPMS #include #endif -- cgit v1.2.3