svn merge file:///D:/svnrepos/vcxsrv/branches/released .

1 files changed, 10 insertions, 22 deletions

diff --git a/xorg-server/mi/mi.h b/xorg-server/mi/mi.h
index 8d8f488a0..6e8b89e19 100644
--- a/xorg-server/mi/mi.h
+++ b/xorg-server/mi/mi.h
@@ -126,6 +126,7 @@ extern void miPutImage(
 /* micursor.c */
 
 extern void miRecolorCursor(
+    DeviceIntPtr /* pDev */,
     ScreenPtr /*pScr*/,
     CursorPtr /*pCurs*/,
     Bool /*displayed*/
@@ -152,12 +153,17 @@ extern Bool mieqInit(
     void
 );
 
+extern void mieqResizeEvents(
+    int /* min_size */
+);
+
 extern void mieqEnqueue(
     DeviceIntPtr /*pDev*/,
     xEventPtr /*e*/
 );
 
 extern void mieqSwitchScreen(
+    DeviceIntPtr /* pDev */,
     ScreenPtr /*pScreen*/,
     Bool /*fromDIX*/
 );
@@ -169,6 +175,10 @@ extern void mieqProcessInputEvents(
 typedef void (*mieqHandler)(int, xEventPtr, DeviceIntPtr, int);
 void mieqSetHandler(int event, mieqHandler handler);
 
+void
+CopyGetMasterEvent(DeviceIntPtr mdev, DeviceIntPtr sdev, xEvent* original,
+                   EventListPtr master, int count);
+
 /* miexpose.c */
 
 extern RegionPtr miHandleExposures(
@@ -363,10 +373,6 @@ extern Bool miRectAlloc(
     int /*n*/
 );
 
-extern int miFindMaxBand(
-    RegionPtr /*prgn*/
-);
-
 #ifdef DEBUG
 extern Bool miValidRegion(
     RegionPtr /*prgn*/
@@ -417,14 +423,6 @@ extern DevPrivateKey miAllocateGCPrivateIndex(
     void
 );
 
-extern PixmapPtr miGetScreenPixmap(
-    ScreenPtr pScreen
-);
-
-extern void miSetScreenPixmap(
-    PixmapPtr pPix
-);
-
 /* mivaltree.c */
 
 extern int miShapedWindowIn(
@@ -479,16 +477,6 @@ extern void miClearToBackground(
     Bool /*generateExposures*/
 );
 
-extern Bool miChangeSaveUnder(
-    WindowPtr /*pWin*/,
-    WindowPtr /*first*/
-);
-
-extern void miPostChangeSaveUnder(
-    WindowPtr /*pWin*/,
-    WindowPtr /*pFirst*/
-);
-
 extern void miMarkWindow(
     WindowPtr /*pWin*/
 );