From 82f319af620ae1e9c8b983d37b038b591575493c Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
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/skin/skin.c |  6 +++---
 gui/wm/ws.c     | 20 ++++++++++----------
 gui/wm/ws.h     |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'gui')

diff --git a/gui/skin/skin.c b/gui/skin/skin.c
index c5a6ec0b92..064bde68cb 100644
--- a/gui/skin/skin.c
+++ b/gui/skin/skin.c
@@ -169,7 +169,7 @@ int cmd_base( char * in )
    if ( skinBPRead( tmp,&defList->main.Bitmap ) ) return 1;
    defList->main.width=defList->main.Bitmap.Width;
    defList->main.height=defList->main.Bitmap.Height;
-#ifdef HAVE_XSHAPE
+#ifdef CONFIG_XSHAPE
     Convert32to1( &defList->main.Bitmap,&defList->main.Mask,0x00ff00ff );
     mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[skin]  mask: %dx%d\n",defList->main.Mask.Width,defList->main.Mask.Height );
 #else
@@ -201,7 +201,7 @@ int cmd_base( char * in )
    if ( skinBPRead( tmp,&defList->menuBase.Bitmap ) ) return 1;
    defList->menuBase.width=defList->menuBase.Bitmap.Width;
    defList->menuBase.height=defList->menuBase.Bitmap.Height;
-#ifdef HAVE_XSHAPE
+#ifdef CONFIG_XSHAPE
     Convert32to1( &defList->menuBase.Bitmap,&defList->menuBase.Mask,0x00ff00ff );
     mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[skin]  mask: %dx%d\n",defList->menuBase.Mask.Width,defList->menuBase.Mask.Height );
 #else
@@ -219,7 +219,7 @@ int cmd_base( char * in )
    if ( skinBPRead( tmp,&defList->bar.Bitmap ) ) return 1;
    defList->bar.width=defList->bar.Bitmap.Width;
    defList->bar.height=defList->bar.Bitmap.Height;
-#ifdef HAVE_XSHAPE
+#ifdef CONFIG_XSHAPE
     Convert32to1( &defList->bar.Bitmap,&defList->bar.Mask,0x00ff00ff );
     mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[skin]  mask: %dx%d\n",defList->bar.Mask.Width,defList->bar.Mask.Height );
 #else
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 <X11/extensions/XShm.h>
-#ifdef HAVE_XSHAPE
+#ifdef CONFIG_XSHAPE
 #include <X11/extensions/shape.h>
 #endif
 
-#ifdef HAVE_XINERAMA
+#ifdef CONFIG_XINERAMA
 #include <X11/extensions/Xinerama.h>
 #endif
 
-#ifdef HAVE_XF86VM
+#ifdef CONFIG_XF86VM
 #include <X11/extensions/xf86vmode.h>
 #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,&nothing,&nothing ) )
@@ -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,&nothing,&nothing ) )
   {
    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 <X11/keysym.h>
 #include <X11/Xatom.h>
 #include <X11/extensions/XShm.h>
-#ifdef HAVE_XDPMS
+#ifdef CONFIG_XDPMS
 #include <X11/extensions/dpms.h>
 #endif
 
-- 
cgit v1.2.3