[xserver-commit] xserver/include scrnintstr.h,1.14,1.15 windowstr.h,1.10,1.11

[Warren Turkal]

Committed by: wt

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

Modified Files:
	scrnintstr.h windowstr.h 
Log Message:
Make the shape extension always build


Index: scrnintstr.h
===================================================================
RCS file: /cvs/xserver/xserver/include/scrnintstr.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- scrnintstr.h	15 Jan 2004 08:53:45 -0000	1.14
+++ scrnintstr.h	12 Feb 2004 18:58:49 -0000	1.15
@@ -513,10 +513,8 @@
     WindowPtr /*pWin*/,
     WindowPtr /*pPriorParent*/);
 
-#ifdef SHAPE
 typedef    void (* SetShapeProcPtr)(
 	WindowPtr /*pWin*/);
-#endif /* SHAPE */
 
 typedef    void (* ChangeBorderWidthProcPtr)(
 	WindowPtr /*pWin*/,
@@ -704,9 +702,7 @@
     HandleExposuresProcPtr	HandleExposures;
     ReparentWindowProcPtr	ReparentWindow;
 
-#ifdef SHAPE
     SetShapeProcPtr		SetShape;
-#endif /* SHAPE */
 
     ChangeBorderWidthProcPtr	ChangeBorderWidth;
     MarkUnrealizedWindowProcPtr	MarkUnrealizedWindow;

Index: windowstr.h
===================================================================
RCS file: /cvs/xserver/xserver/include/windowstr.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- windowstr.h	5 Nov 2003 05:45:31 -0000	1.10
+++ windowstr.h	12 Feb 2004 18:58:49 -0000	1.11
@@ -83,10 +83,8 @@
     PropertyPtr		userProps;	   /* default: NULL */
     unsigned long	backingBitPlanes;  /* default: ~0L */
     unsigned long	backingPixel;	   /* default: 0 */
-#ifdef SHAPE
     RegionPtr		boundingShape;	   /* default: NULL */
     RegionPtr		clipShape;	   /* default: NULL */
-#endif
 #ifdef XINPUT
     struct _OtherInputMasks *inputMasks;   /* default: NULL */
 #endif
@@ -171,20 +169,14 @@
 #define wUserProps(w)		wUseDefault(w, userProps, NULL)
 #define wBackingBitPlanes(w)	wUseDefault(w, backingBitPlanes, ~0L)
 #define wBackingPixel(w)	wUseDefault(w, backingPixel, 0)
-#ifdef SHAPE
 #define wBoundingShape(w)	wUseDefault(w, boundingShape, NULL)
 #define wClipShape(w)		wUseDefault(w, clipShape, NULL)
-#endif
 #define wClient(w)		(clients[CLIENT_ID((w)->drawable.id)])
 #define wBorderWidth(w)		((int) (w)->borderWidth)
 
 /* true when w needs a border drawn. */
 
-#ifdef SHAPE
 #define HasBorder(w)	((w)->borderWidth || wClipShape(w))
-#else
-#define HasBorder(w)	((w)->borderWidth)
-#endif
 
 typedef struct _ScreenSaverStuff {
     WindowPtr pWindow;