[xserver-commit] xserver/hw/xwin win.h,1.39,1.40 winmultiwindowshape.c,1.2,1.3 winmultiwindowwindow.c,1.4,1.5 winscrinit.c,1.29,1.30 winwindow.c,1.9,1.10

[Warren Turkal]

Committed by: wt

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

Modified Files:
	win.h winmultiwindowshape.c winmultiwindowwindow.c 
	winscrinit.c winwindow.c 
Log Message:
Make the shape extension always build


Index: win.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/xwin/win.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- win.h	27 Oct 2003 04:49:48 -0000	1.39
+++ win.h	12 Feb 2004 18:58:49 -0000	1.40
@@ -547,9 +547,7 @@
   ClipNotifyProcPtr			ClipNotify;
   RestackWindowProcPtr			RestackWindow;
   ReparentWindowProcPtr			ReparentWindow;
-#ifdef SHAPE
   SetShapeProcPtr			SetShape;
-#endif
 } winPrivScreenRec;
 
 
@@ -1421,10 +1419,8 @@
 Bool
 winMapWindowPRootless (WindowPtr pWindow);
 
-#ifdef SHAPE
 void
 winSetShapePRootless (WindowPtr pWindow);
-#endif
 
 
 /*
@@ -1442,7 +1438,6 @@
  * winmultiwindowshape.c
  */
 
-#ifdef SHAPE
 void
 winReshapeMultiWindow (WindowPtr pWin);
 
@@ -1451,7 +1446,6 @@
 
 void
 winUpdateRgnMultiWindow (WindowPtr pWindow);
-#endif
 
 
 /*

Index: winmultiwindowshape.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xwin/winmultiwindowshape.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- winmultiwindowshape.c	27 Oct 2003 04:49:48 -0000	1.2
+++ winmultiwindowshape.c	12 Feb 2004 18:58:49 -0000	1.3
@@ -30,8 +30,6 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.5 2002/11/07 10:31:32 alanh Exp $ */
 
-#ifdef SHAPE
-
 #include "win.h"
 
 
@@ -209,4 +207,3 @@
   
   return;
 }
-#endif

Index: winmultiwindowwindow.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xwin/winmultiwindowwindow.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- winmultiwindowwindow.c	27 Oct 2003 04:49:48 -0000	1.4
+++ winmultiwindowwindow.c	12 Feb 2004 18:58:49 -0000	1.5
@@ -328,11 +328,9 @@
   /* Refresh/redisplay the Windows window associated with this X window */
   winUpdateWindowsWindow (pWin);
 
-#ifdef SHAPE
   /* Update the Windows window's shape */
   winReshapeMultiWindow (pWin);
   winUpdateRgnMultiWindow (pWin);
-#endif
 
   return fResult;
 }

Index: winscrinit.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xwin/winscrinit.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- winscrinit.c	27 Oct 2003 04:49:48 -0000	1.29
+++ winscrinit.c	12 Feb 2004 18:58:49 -0000	1.30
@@ -425,9 +425,7 @@
       WRAP(UnrealizeWindow);
       WRAP(PositionWindow);
       WRAP(ChangeWindowAttributes);
-#ifdef SHAPE
       WRAP(SetShape);
-#endif
 
       /* Assign pseudo-rootless window procedures to be top level procedures */
       pScreen->CreateWindow = winCreateWindowPRootless;
@@ -436,9 +434,7 @@
       pScreen->ChangeWindowAttributes = winChangeWindowAttributesPRootless;
       pScreen->RealizeWindow = winMapWindowPRootless;
       pScreen->UnrealizeWindow = winUnmapWindowPRootless;
-#ifdef SHAPE
       pScreen->SetShape = winSetShapePRootless;
-#endif
 
       /* Undefine the WRAP macro, as it is not needed elsewhere */
 #undef WRAP
@@ -464,9 +460,7 @@
       WRAP(ChangeWindowAttributes);
       WRAP(ReparentWindow);
       WRAP(RestackWindow);
-#ifdef SHAPE
       WRAP(SetShape);
-#endif
 
       /* Assign multi-window window procedures to be top level procedures */
       pScreen->CreateWindow = winCreateWindowMultiWindow;
@@ -477,9 +471,7 @@
       pScreen->UnrealizeWindow = winUnmapWindowMultiWindow;
       pScreen->ReparentWindow = winReparentWindowMultiWindow;
       pScreen->RestackWindow = winRestackWindowMultiWindow;
-#ifdef SHAPE
       pScreen->SetShape = winSetShapeMultiWindow;
-#endif
 
       /* Undefine the WRAP macro, as it is not needed elsewhere */
 #undef WRAP

Index: winwindow.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xwin/winwindow.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- winwindow.c	27 Oct 2003 04:49:48 -0000	1.9
+++ winwindow.c	12 Feb 2004 18:58:49 -0000	1.10
@@ -43,11 +43,9 @@
 void
 winUpdateRgnPRootless (WindowPtr pWindow);
 
-#ifdef SHAPE
 static
 void
 winReshapePRootless (WindowPtr pWin);
-#endif
 
 
 /* See Porting Layer Definition - p. 37 */
@@ -353,7 +351,6 @@
 }
 
 
-#ifdef SHAPE
 void
 winSetShapePRootless (WindowPtr pWin)
 {
@@ -368,7 +365,6 @@
   
   return;
 }
-#endif
 
 
 /*
@@ -459,7 +455,6 @@
 }
 
 
-#ifdef SHAPE
 static
 void
 winReshapePRootless (WindowPtr pWin)
@@ -538,4 +533,3 @@
   
   return;
 }
-#endif