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/midispcur.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/midispcur.c')
| -rw-r--r-- | nx-X11/programs/Xserver/mi/midispcur.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/mi/midispcur.c b/nx-X11/programs/Xserver/mi/midispcur.c index 2ed908de4..df15ea311 100644 --- a/nx-X11/programs/Xserver/mi/midispcur.c +++ b/nx-X11/programs/Xserver/mi/midispcur.c @@ -56,7 +56,7 @@ in this Software without prior written authorization from The Open Group. static int miDCScreenIndex; static unsigned long miDCGeneration = 0; -static Bool miDCCloseScreen(int index, ScreenPtr pScreen); +static Bool miDCCloseScreen(ScreenPtr pScreen); typedef struct { GCPtr pSourceGC, pMaskGC; @@ -163,8 +163,7 @@ miDCInitialize (pScreen, screenFuncs) #define tossPict(pict) (pict ? FreePicture (pict, 0) : 0) static Bool -miDCCloseScreen (index, pScreen) - int index; +miDCCloseScreen (pScreen) ScreenPtr pScreen; { miDCScreenPtr pScreenPriv; @@ -185,7 +184,7 @@ miDCCloseScreen (index, pScreen) tossPict (pScreenPriv->pTempPicture); #endif free ((void *) pScreenPriv); - return (*pScreen->CloseScreen) (index, pScreen); + return (*pScreen->CloseScreen) (pScreen); } static Bool |