[MPlayer-cvslog] r34552 - trunk/gui/skin/skin.c

[ib]

Author: ib
Date: Thu Jan 12 17:14:20 2012
New Revision: 34552

Log:
Remove unnecessary #ifdef.

If there is no XShape extension, Mask.Image will be ignored
(by wsSetShape()) anyway.

Modified:
   trunk/gui/skin/skin.c

Modified: trunk/gui/skin/skin.c
==============================================================================
--- trunk/gui/skin/skin.c	Thu Jan 12 17:08:07 2012	(r34551)
+++ trunk/gui/skin/skin.c	Thu Jan 12 17:14:20 2012	(r34552)
@@ -354,15 +354,11 @@ static int item_base(char *in)
     mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]     bitmap: %dx%d\n", currWin->width, currWin->height);
 
     if (!is_sub) {
-#ifdef CONFIG_XSHAPE
         if (!bpRenderMask(&currWin->Bitmap, &currWin->Mask)) {
             skin_error(MSGTR_SKIN_NotEnoughMemory);
             return 1;
         }
         mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]     mask: %lux%lu\n", currWin->Mask.Width, currWin->Mask.Height);
-#else
-        currWin->Mask.Image = NULL;
-#endif
     }
 
     if (is_bar)