aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/mi/misprite.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@gmail.com>2017-03-11 00:53:01 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-04-10 14:56:29 +0200
commit93ea74e53e13890ea2f85ea57e9455d0eb2525f4 (patch)
tree9df00122916a65b8c53ee37129628efd916029f9 /nx-X11/programs/Xserver/mi/misprite.c
parentab3974f22b213a64316bf4384c3fd6d92c005f58 (diff)
downloadnx-libs-93ea74e53e13890ea2f85ea57e9455d0eb2525f4.tar.gz
nx-libs-93ea74e53e13890ea2f85ea57e9455d0eb2525f4.tar.bz2
nx-libs-93ea74e53e13890ea2f85ea57e9455d0eb2525f4.zip
xserver: remove index from CloseScreen (API/ABI breakage)
Extracted from X.org bulk commit: commit 1f0e8bd5eb1a5539689cfc4f5a6b86b530907ec5 Author: Dave Airlie <airlied@redhat.com> Date: Tue Jun 5 13:22:18 2012 +0100 api: rework the X server driver API to avoid global arrays. This is a squash merge containing all the API changes, as well as the video ABI bump. Its been squashed to make bisection easier. Full patch log below: [...] commit 06729dbbc804a20242e6499f446acb5d94023c3c Author: Dave Airlie <airlied@gmail.com> Date: Tue Apr 10 14:04:59 2012 +0100 xserver: remove index from CloseScreen (API/ABI breakage) This drops the index from the CloseScreen callback, its always been useless really, since the pScreen contains it. Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Acked-by: Aaron Plattner <aplattner@nvidia.com> Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'nx-X11/programs/Xserver/mi/misprite.c')
-rw-r--r--nx-X11/programs/Xserver/mi/misprite.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/mi/misprite.c b/nx-X11/programs/Xserver/mi/misprite.c
index 592013d7f..151de776d 100644
--- a/nx-X11/programs/Xserver/mi/misprite.c
+++ b/nx-X11/programs/Xserver/mi/misprite.c
@@ -70,7 +70,7 @@ in this Software without prior written authorization from The Open Group.
static int miSpriteScreenIndex;
static unsigned long miSpriteGeneration = 0;
-static Bool miSpriteCloseScreen(int i, ScreenPtr pScreen);
+static Bool miSpriteCloseScreen(ScreenPtr pScreen);
static void miSpriteGetImage(DrawablePtr pDrawable, int sx, int sy,
int w, int h, unsigned int format,
unsigned long planemask, char *pdstLine);
@@ -248,8 +248,7 @@ miSpriteInitialize (pScreen, cursorFuncs, screenFuncs)
*/
static Bool
-miSpriteCloseScreen (i, pScreen)
- int i;
+miSpriteCloseScreen (pScreen)
ScreenPtr pScreen;
{
miSpriteScreenPtr pScreenPriv;
@@ -270,7 +269,7 @@ miSpriteCloseScreen (i, pScreen)
free ((void *) pScreenPriv);
- return (*pScreen->CloseScreen) (i, pScreen);
+ return (*pScreen->CloseScreen) (pScreen);
}
static void