# HG changeset patch # User ib # Date 1326384860 0 # Node ID 251018f5254b4912c022624a393b92cce04a911c # Parent c44d95befb0a43d7bc4fca60d5cd3ea60748f339 Remove unnecessary #ifdef. If there is no XShape extension, Mask.Image will be ignored (by wsSetShape()) anyway. diff -r c44d95befb0a -r 251018f5254b gui/skin/skin.c --- a/gui/skin/skin.c Thu Jan 12 16:08:07 2012 +0000 +++ b/gui/skin/skin.c Thu Jan 12 16:14:20 2012 +0000 @@ -354,15 +354,11 @@ 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)