Better separate the XShm using code

Dmitry Timoshkov dmitry at baikal.ru
Mon Jun 25 07:38:25 CDT 2001


Hello.

Changelog:
    Dmitry Timoshkov <dmitry at codeweavers.com>
    Better separate the XShm using code.

--- cvs/hq/wine/graphics/x11drv/dib.c	Sat May 12 06:12:20 2001
+++ wine/graphics/x11drv/dib.c	Sun Jun 24 15:01:02 2001
@@ -34,7 +34,9 @@
 
 static int ximageDepthTable[32];
 
+#ifdef HAVE_LIBXXSHM
 static int XShmErrorFlag = 0;
+#endif
 
 /* This structure holds the arguments for DIB_SetImageBits() */
 typedef struct
@@ -2776,6 +2778,7 @@
      descr->drawable, descr->gc, bmpImage,
      descr->xSrc, descr->ySrc, descr->xDest, descr->yDest,
      descr->width, descr->height);
+#ifdef HAVE_LIBXXSHM
     if (descr->useShm)
     {
         XShmPutImage( gdi_display, descr->drawable, descr->gc, bmpImage,
@@ -2784,6 +2787,7 @@
         XSync( gdi_display, 0 );
     }
     else
+#endif
         XPutImage( gdi_display, descr->drawable, descr->gc, bmpImage,
 		   descr->xSrc, descr->ySrc, descr->xDest, descr->yDest,
 		   descr->width, descr->height );
@@ -3769,6 +3773,7 @@
     return res;
 }
 
+#ifdef HAVE_LIBXXSHM
 /***********************************************************************
  *           X11DRV_XShmErrorHandler
  *
@@ -3783,8 +3788,6 @@
  *           X11DRV_XShmCreateImage
  *
  */
-
-#ifdef HAVE_LIBXXSHM
 static XImage *X11DRV_XShmCreateImage( int width, int height, int bpp,
                                        XShmSegmentInfo* shminfo)
 {






More information about the wine-patches mailing list