diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-04-10 15:01:39 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-04-10 15:01:39 +0200 |
| commit | 5421dd444422df233c2bba82b994ce8f8d677044 (patch) | |
| tree | 9df00122916a65b8c53ee37129628efd916029f9 /nx-X11/programs/Xserver/mi/mipointer.c | |
| parent | ab3974f22b213a64316bf4384c3fd6d92c005f58 (diff) | |
| parent | 93ea74e53e13890ea2f85ea57e9455d0eb2525f4 (diff) | |
| download | nx-libs-5421dd444422df233c2bba82b994ce8f8d677044.tar.gz nx-libs-5421dd444422df233c2bba82b994ce8f8d677044.tar.bz2 nx-libs-5421dd444422df233c2bba82b994ce8f8d677044.zip | |
Merge branch 'sunweaver-pr/remove-index-from-CloseScreen-ABI-backport' into 3.6.x
Attributes GH PR #411: https://github.com/ArcticaProject/nx-libs/pull/411
Diffstat (limited to 'nx-X11/programs/Xserver/mi/mipointer.c')
| -rw-r--r-- | nx-X11/programs/Xserver/mi/mipointer.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/mi/mipointer.c b/nx-X11/programs/Xserver/mi/mipointer.c index 01502c251..dc5a4985d 100644 --- a/nx-X11/programs/Xserver/mi/mipointer.c +++ b/nx-X11/programs/Xserver/mi/mipointer.c @@ -66,7 +66,7 @@ static void miPointerCursorLimits(ScreenPtr pScreen, CursorPtr pCursor, BoxPtr pHotBox, BoxPtr pTopLeftBox); static Bool miPointerSetCursorPosition(ScreenPtr pScreen, int x, int y, Bool generateEvent); -static Bool miPointerCloseScreen(int index, ScreenPtr pScreen); +static Bool miPointerCloseScreen(ScreenPtr pScreen); static void miPointerMove(ScreenPtr pScreen, int x, int y, unsigned long time); Bool @@ -132,8 +132,7 @@ miPointerInitialize (pScreen, spriteFuncs, screenFuncs, waitForUpdate) } static Bool -miPointerCloseScreen (index, pScreen) - int index; +miPointerCloseScreen (pScreen) ScreenPtr pScreen; { SetupScreen(pScreen); @@ -144,7 +143,7 @@ miPointerCloseScreen (index, pScreen) miPointer.pSpriteScreen = 0; pScreen->CloseScreen = pScreenPriv->CloseScreen; free ((void *) pScreenPriv); - return (*pScreen->CloseScreen) (index, pScreen); + return (*pScreen->CloseScreen) (pScreen); } /* |