Austin English : winex11: Only declare X11DRV_DIB_QueryXShm if XShm is supported.

Alexandre Julliard julliard at winehq.org
Fri Oct 28 12:48:37 CDT 2011


Module: wine
Branch: master
Commit: 31f8a525c8ce42b815d0824ffd213e15f4776c6b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=31f8a525c8ce42b815d0824ffd213e15f4776c6b

Author: Austin English <austinenglish at gmail.com>
Date:   Thu Oct 27 13:25:26 2011 -0500

winex11: Only declare X11DRV_DIB_QueryXShm if XShm is supported.

---

 dlls/winex11.drv/dib.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c
index b70dcfa..7e30530 100644
--- a/dlls/winex11.drv/dib.c
+++ b/dlls/winex11.drv/dib.c
@@ -3849,7 +3849,6 @@ static XImage *X11DRV_XShmCreateImage( int width, int height, int bpp,
     }
     return image;
 }
-#endif /* HAVE_LIBXXSHM */
 
 static Bool X11DRV_DIB_QueryXShm( Bool *pixmaps )
 {
@@ -3858,17 +3857,16 @@ static Bool X11DRV_DIB_QueryXShm( Bool *pixmaps )
 
     if (!initialized)
     {
-#ifdef HAVE_LIBXXSHM
         int major, minor;
 
         have_xshm = XShmQueryVersion( gdi_display, &major, &minor, &have_xshm_pixmaps );
-#endif
         initialized = TRUE;
     }
 
     *pixmaps = have_xshm_pixmaps;
     return have_xshm;
 }
+#endif /* HAVE_LIBXXSHM */
 
 /***********************************************************************
  *           X11DRV_CreateDIBSection   (X11DRV.@)




More information about the wine-cvs mailing list