From e3cca1a275a55fcc5e074a7cc7aaa5d0764b9659 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 27 Jul 2009 14:09:54 +0000
Subject: vcxsrv compiles now. Still run-time errors.

---
 xorg-server/mi/mipointer.c | 4 ++--
 xorg-server/mi/misprite.c  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'xorg-server/mi')

diff --git a/xorg-server/mi/mipointer.c b/xorg-server/mi/mipointer.c
index e37316e71..85cc70de0 100644
--- a/xorg-server/mi/mipointer.c
+++ b/xorg-server/mi/mipointer.c
@@ -285,10 +285,10 @@ miPointerDeviceInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)
 static void
 miPointerDeviceCleanup(DeviceIntPtr pDev, ScreenPtr pScreen)
 {
+    SetupScreen(pScreen);
     if (!pDev->isMaster && pDev->u.master)
         return;
 
-    SetupScreen(pScreen);
     (*pScreenPriv->spriteFuncs->DeviceCursorCleanup)(pDev, pScreen);
     xfree(dixLookupPrivate(&pDev->devPrivates, miPointerPrivKey));
     dixSetPrivate(&pDev->devPrivates, miPointerPrivKey, NULL);
@@ -302,9 +302,9 @@ miPointerWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
 {
     miPointerPtr pPointer;
     BOOL changedScreen = FALSE;
+    SetupScreen (pScreen);
 
     pPointer = MIPOINTER(pDev);
-    SetupScreen (pScreen);
 
     if (pPointer->pScreen != pScreen)
     {
diff --git a/xorg-server/mi/misprite.c b/xorg-server/mi/misprite.c
index 692e6c97a..0b83abdb4 100644
--- a/xorg-server/mi/misprite.c
+++ b/xorg-server/mi/misprite.c
@@ -725,10 +725,10 @@ miSpriteSetCursor (DeviceIntPtr pDev, ScreenPtr pScreen,
                    CursorPtr pCursor, int x, int y)
 {
     miSpriteScreenPtr	pScreenPriv;
+    miCursorInfoPtr pPointer;
 
     pScreenPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
 						      miSpriteScreenKey);
-    miCursorInfoPtr pPointer;
 
     if (!pDev->isMaster && !pDev->u.master)
     {
-- 
cgit v1.2.3