[xserver-commit] xserver/xfixes region.c,1.5,1.6

[Warren Turkal]

Committed by: wt

Update of /cvs/xserver/xserver/xfixes
In directory pdx:/tmp/cvs-serv27606/xfixes

Modified Files:
	region.c 
Log Message:
Make the shape extension always build


Index: region.c
===================================================================
RCS file: /cvs/xserver/xserver/xfixes/region.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- region.c	22 Nov 2003 00:49:11 -0000	1.5
+++ region.c	12 Feb 2004 18:58:49 -0000	1.6
@@ -31,9 +31,7 @@
 #endif
 #include <regionstr.h>
 #include <gcstruct.h>
-#ifdef SHAPE
 #include <shapeint.h>
-#endif
 
 RESTYPE	    RegionResType;
 
@@ -168,20 +166,16 @@
     }
     switch (stuff->kind) {
     case WindowRegionBounding:
-#ifdef SHAPE
 	pRegion = wBoundingShape(pWin);
 	if (!pRegion)
-#endif
 	{
 	    pRegion = CreateBoundingShape (pWin);
 	    copy = FALSE;
 	}
 	break;
     case WindowRegionClip:
-#ifdef SHAPE
 	pRegion = wClipShape(pWin);
 	if (!pRegion)
-#endif
 	{
 	    pRegion = CreateClipShape (pWin);
 	    copy = FALSE;
@@ -670,7 +664,6 @@
 int
 ProcXFixesSetWindowShapeRegion (ClientPtr client)
 {
-#ifdef SHAPE
     WindowPtr	    pWin;
     ScreenPtr	    pScreen;
     RegionPtr	    pRegion;
@@ -730,9 +723,6 @@
     (*pScreen->SetShape) (pWin);
     SendShapeNotify (pWin, stuff->destKind);
     return (client->noClientException);
-#else
-    return BadRequest;
-#endif
 }
 
 int