diff gui/skin/skin.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 b0a7b35b78d2
children 0f1b5b68af32
line wrap: on
line diff
--- a/gui/skin/skin.c	Sun Aug 03 20:17:46 2008 +0000
+++ b/gui/skin/skin.c	Mon Aug 04 06:16:23 2008 +0000
@@ -169,7 +169,7 @@
    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 @@
    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 @@
    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