[xserver-commit] xserver/Xext panoramiXprocs.c,3.36,3.37
Warren Turkal
xserver-commit@pdx.freedesktop.org
Committed by: wt
Update of /cvs/xserver/xserver/Xext
In directory pdx:/tmp/cvs-serv27606/Xext
Modified Files:
panoramiXprocs.c
Log Message:
Make the shape extension always build
Index: panoramiXprocs.c
===================================================================
RCS file: /cvs/xserver/xserver/Xext/panoramiXprocs.c,v
retrieving revision 3.36
retrieving revision 3.37
diff -u -d -r3.36 -r3.37
--- panoramiXprocs.c 11 Sep 2003 05:12:50 -0000 3.36
+++ panoramiXprocs.c 12 Feb 2004 18:58:49 -0000 3.37
@@ -603,9 +603,7 @@
}
pWin = pDst->firstChild;
while (pWin) {
-#ifdef SHAPE
BoxRec box;
-#endif
if ((pWin->mapped) &&
(x >= pWin->drawable.x - wBorderWidth (pWin)) &&
(x < pWin->drawable.x + (int)pWin->drawable.width +
@@ -613,7 +611,6 @@
(y >= pWin->drawable.y - wBorderWidth (pWin)) &&
(y < pWin->drawable.y + (int)pWin->drawable.height +
wBorderWidth (pWin))
-#ifdef SHAPE
/* When a window is shaped, a further check
* is made to see if the point is inside
* borderSize
@@ -623,7 +620,6 @@
wBoundingShape(pWin),
x - pWin->drawable.x,
y - pWin->drawable.y, &box))
-#endif
)
{
rep.child = pWin->drawable.id;