Shape extension is built-in and mandatory.

5 files changed, 0 insertions, 26 deletions

diff --git a/hw/xwin/win.h b/hw/xwin/win.h
index 3ab324931..ea54b997c 100644
--- a/hw/xwin/win.h
+++ b/hw/xwin/win.h
@@ -586,9 +586,7 @@ typedef struct _winPrivScreenRec
   ReparentWindowProcPtr			ReparentWindow;
   ResizeWindowProcPtr			ResizeWindow;
   MoveWindowProcPtr			MoveWindow;
-#ifdef SHAPE
   SetShapeProcPtr			SetShape;
-#endif
 
   winCursorRec                          cursor;
 } winPrivScreenRec;
@@ -1196,10 +1194,8 @@ winUnmapWindowRootless (WindowPtr pWindow);
 Bool
 winMapWindowRootless (WindowPtr pWindow);
 
-#ifdef SHAPE
 void
 winSetShapeRootless (WindowPtr pWindow);
-#endif
 
 
 /*
@@ -1215,7 +1211,6 @@ winXIconToHICON (WindowPtr pWin, int iconSize);
  * winmultiwindowshape.c
  */
 
-# ifdef SHAPE
 void
 winReshapeMultiWindow (WindowPtr pWin);
 
@@ -1224,7 +1219,6 @@ winSetShapeMultiWindow (WindowPtr pWindow);
 
 void
 winUpdateRgnMultiWindow (WindowPtr pWindow);
-# endif
 #endif
 
 
diff --git a/hw/xwin/winmultiwindowshape.c b/hw/xwin/winmultiwindowshape.c
index 33deae337..62cddd0a1 100644
--- a/hw/xwin/winmultiwindowshape.c
+++ b/hw/xwin/winmultiwindowshape.c
@@ -32,7 +32,6 @@
 #ifdef HAVE_XWIN_CONFIG_H
 #include <xwin-config.h>
 #endif
-#ifdef SHAPE
 
 #include "win.h"
 
@@ -208,4 +207,3 @@ winReshapeMultiWindow (WindowPtr pWin)
   
   return;
 }
-#endif
diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c
index 037c881b4..75bef9786 100644
--- a/hw/xwin/winmultiwindowwindow.c
+++ b/hw/xwin/winmultiwindowwindow.c
@@ -352,11 +352,9 @@ winMapWindowMultiWindow (WindowPtr pWin)
   /* 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;
 }
diff --git a/hw/xwin/winscrinit.c b/hw/xwin/winscrinit.c
index 9dc4c3da5..512109500 100644
--- a/hw/xwin/winscrinit.c
+++ b/hw/xwin/winscrinit.c
@@ -478,9 +478,7 @@ winFinishScreenInitFB (int index,
       WRAP(UnrealizeWindow);
       WRAP(PositionWindow);
       WRAP(ChangeWindowAttributes);
-#ifdef SHAPE
       WRAP(SetShape);
-#endif
 
       /* Assign rootless window procedures to be top level procedures */
       pScreen->CreateWindow = winCreateWindowRootless;
@@ -489,9 +487,7 @@ winFinishScreenInitFB (int index,
       /*pScreen->ChangeWindowAttributes = winChangeWindowAttributesRootless;*/
       pScreen->RealizeWindow = winMapWindowRootless;
       pScreen->UnrealizeWindow = winUnmapWindowRootless;
-#ifdef SHAPE
       pScreen->SetShape = winSetShapeRootless;
-#endif
 
       /* Undefine the WRAP macro, as it is not needed elsewhere */
 #undef WRAP
@@ -523,9 +519,7 @@ winFinishScreenInitFB (int index,
       WRAP(ResizeWindow);
       WRAP(MoveWindow);
       WRAP(CopyWindow);
-#ifdef SHAPE
       WRAP(SetShape);
-#endif
 
       /* Assign multi-window window procedures to be top level procedures */
       pScreen->CreateWindow = winCreateWindowMultiWindow;
@@ -539,9 +533,7 @@ winFinishScreenInitFB (int index,
       pScreen->ResizeWindow = winResizeWindowMultiWindow;
       pScreen->MoveWindow = winMoveWindowMultiWindow;
       pScreen->CopyWindow = winCopyWindowMultiWindow;
-#ifdef SHAPE
       pScreen->SetShape = winSetShapeMultiWindow;
-#endif
 
       /* Undefine the WRAP macro, as it is not needed elsewhere */
 #undef WRAP
diff --git a/hw/xwin/winwindow.c b/hw/xwin/winwindow.c
index 1600996df..285a344f7 100644
--- a/hw/xwin/winwindow.c
+++ b/hw/xwin/winwindow.c
@@ -46,11 +46,9 @@ static
 void
 winUpdateRgnRootless (WindowPtr pWindow);
 
-#ifdef SHAPE
 static
 void
 winReshapeRootless (WindowPtr pWin);
-#endif
 
 
 #ifdef XWIN_NATIVEGDI
@@ -447,9 +445,7 @@ winMapWindowRootless (WindowPtr pWin)
   fResult = (*pScreen->RealizeWindow)(pWin);
   WIN_WRAP(RealizeWindow, winMapWindowRootless);
 
-#ifdef SHAPE
   winReshapeRootless (pWin);
-#endif
   
   winUpdateRgnRootless (pWin);
   
@@ -457,7 +453,6 @@ winMapWindowRootless (WindowPtr pWin)
 }
 
 
-#ifdef SHAPE
 void
 winSetShapeRootless (WindowPtr pWin)
 {
@@ -478,7 +473,6 @@ winSetShapeRootless (WindowPtr pWin)
   
   return;
 }
-#endif
 
 
 /*
@@ -569,7 +563,6 @@ winUpdateRgnRootless (WindowPtr pWin)
 }
 
 
-#ifdef SHAPE
 static
 void
 winReshapeRootless (WindowPtr pWin)
@@ -646,4 +639,3 @@ winReshapeRootless (WindowPtr pWin)
   
   return;
 }
-#endif