Subject: winex/graphics/x11drv dib.c,1.98,1.99Update of /var/lib/cvsd/cvsroot/winex/graphics/x11drv
In directory agravaine:/tmp/cvs-serv6985/graphics/x11drv
Modified Files:
dib.c
Log Message:
Compile fixes for --enable-xshm=no
Index: dib.c
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/graphics/x11drv/dib.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- dib.c 9 Jan 2006 18:11:41 -0000 1.98
+++ dib.c 30 Mar 2007 19:00:27 -0000 1.99
@@ -4598,7 +4598,11 @@
wine_tsx11_lock();
- if ( !(bmpImage || descr->sharedPixmap) ) /* shared pixmap is same depth stuff */
+ if ( !(bmpImage
+#ifdef HAVE_LIBXXSHM
+ || descr->sharedPixmap
+#endif /* HAVE_LIBXXSHM */
+ ) ) /* shared pixmap is same depth stuff */
{
imageCreated = TRUE;
if (descr->image)
@@ -4778,7 +4782,11 @@
wine_tsx11_lock();
- if (! (bmpImage || descr->sharedPixmap) )
+ if (! (bmpImage
+#ifdef HAVE_LIBXXSHM
+ || descr->sharedPixmap
+#endif /* HAVE_LIBXXSHM */
+ ) )
{
imageCreated = TRUE;
if (descr->image)
@@ -6514,7 +6522,11 @@
if (VIRTUAL_SetFaultHandler(bm.bmBits, X11DRV_DIB_FaultHandler, (LPVOID)res))
{
X11DRV_DIB_DoProtectDIBSection( bmp, PAGE_READWRITE );
+#ifdef HAVE_LIBXXSHM
if (dib) dib->status = dib->sharedPixmap ? DIB_Status_InSync : DIB_Status_AppMod;
+#else
+ if (dib) dib->status = DIB_Status_AppMod;
+#endif
}
}
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.