frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mi: don't mix declarations and code

This commit is contained in:
Julien Cristau 2009-01-11 08:42:57 +01:00
parent 5aa9483d3e
commit 46f3c1b937
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mi/mipointer.c
View File

@ -284,10 +284,11 @@ miPointerDeviceInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)
static void static void
miPointerDeviceCleanup(DeviceIntPtr pDev, ScreenPtr pScreen) miPointerDeviceCleanup(DeviceIntPtr pDev, ScreenPtr pScreen)
{ {
SetupScreen(pScreen);
if (!pDev->isMaster && pDev->u.master) if (!pDev->isMaster && pDev->u.master)
return; return;
SetupScreen(pScreen);
(*pScreenPriv->spriteFuncs->DeviceCursorCleanup)(pDev, pScreen); (*pScreenPriv->spriteFuncs->DeviceCursorCleanup)(pDev, pScreen);
xfree(dixLookupPrivate(&pDev->devPrivates, miPointerPrivKey)); xfree(dixLookupPrivate(&pDev->devPrivates, miPointerPrivKey));
dixSetPrivate(&pDev->devPrivates, miPointerPrivKey, NULL); dixSetPrivate(&pDev->devPrivates, miPointerPrivKey, NULL);
@ -302,8 +303,8 @@ miPointerWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
miPointerPtr pPointer; miPointerPtr pPointer;
BOOL changedScreen = FALSE; BOOL changedScreen = FALSE;
pPointer = MIPOINTER(pDev);
SetupScreen (pScreen); SetupScreen (pScreen);
pPointer = MIPOINTER(pDev);
if (pPointer->pScreen != pScreen) if (pPointer->pScreen != pScreen)
{ {

2
mi/misprite.c
View File

@ -725,10 +725,10 @@ miSpriteSetCursor (DeviceIntPtr pDev, ScreenPtr pScreen,
CursorPtr pCursor, int x, int y) CursorPtr pCursor, int x, int y)
{ {
miSpriteScreenPtr pScreenPriv; miSpriteScreenPtr pScreenPriv;
miCursorInfoPtr pPointer;
pScreenPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates, pScreenPriv = (miSpriteScreenPtr)dixLookupPrivate(&pScreen->devPrivates,
miSpriteScreenKey); miSpriteScreenKey);
miCursorInfoPtr pPointer;
if (!pDev->isMaster && !pDev->u.master) if (!pDev->isMaster && !pDev->u.master)
{ {