From 93ea74e53e13890ea2f85ea57e9455d0eb2525f4 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Sat, 11 Mar 2017 00:53:01 +0100 Subject: xserver: remove index from CloseScreen (API/ABI breakage) Extracted from X.org bulk commit: commit 1f0e8bd5eb1a5539689cfc4f5a6b86b530907ec5 Author: Dave Airlie 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 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 Acked-by: Aaron Plattner Reviewed-by: Adam Jackson Signed-off-by: Dave Airlie --- nx-X11/programs/Xserver/mi/mibstore.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'nx-X11/programs/Xserver/mi/mibstore.c') diff --git a/nx-X11/programs/Xserver/mi/mibstore.c b/nx-X11/programs/Xserver/mi/mibstore.c index 5fddc8573..3c4b74814 100644 --- a/nx-X11/programs/Xserver/mi/mibstore.c +++ b/nx-X11/programs/Xserver/mi/mibstore.c @@ -183,7 +183,7 @@ else \ static int miBSScreenIndex; static unsigned long miBSGeneration = 0; -static Bool miBSCloseScreen(int i, ScreenPtr pScreen); +static Bool miBSCloseScreen(ScreenPtr pScreen); static void miBSGetImage(DrawablePtr pDrawable, int sx, int sy, int w, int h, unsigned int format, unsigned long planemask, char *pdstLine); @@ -416,8 +416,7 @@ miInitializeBackingStore (pScreen) */ static Bool -miBSCloseScreen (i, pScreen) - int i; +miBSCloseScreen (pScreen) ScreenPtr pScreen; { miBSScreenPtr pScreenPriv; @@ -432,7 +431,7 @@ miBSCloseScreen (i, pScreen) free ((void *) pScreenPriv); - return (*pScreen->CloseScreen) (i, pScreen); + return (*pScreen->CloseScreen) (pScreen); } static void miBSFillVirtualBits(DrawablePtr pDrawable, GCPtr pGC, -- cgit v1.2.3