aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/miext
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-04-10 15:01:39 +0200
committerMihai Moldovan <ionic@ionic.de>2017-04-10 15:01:39 +0200
commit5421dd444422df233c2bba82b994ce8f8d677044 (patch)
tree9df00122916a65b8c53ee37129628efd916029f9 /nx-X11/programs/Xserver/miext
parentab3974f22b213a64316bf4384c3fd6d92c005f58 (diff)
parent93ea74e53e13890ea2f85ea57e9455d0eb2525f4 (diff)
downloadnx-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/miext')
-rw-r--r--nx-X11/programs/Xserver/miext/cw/cw.c6
-rw-r--r--nx-X11/programs/Xserver/miext/damage/damage.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/miext/cw/cw.c b/nx-X11/programs/Xserver/miext/cw/cw.c
index 774f0d056..d9ca55f7e 100644
--- a/nx-X11/programs/Xserver/miext/cw/cw.c
+++ b/nx-X11/programs/Xserver/miext/cw/cw.c
@@ -55,7 +55,7 @@ static unsigned long cwGeneration = 0;
extern GCOps cwGCOps;
static Bool
-cwCloseScreen (int i, ScreenPtr pScreen);
+cwCloseScreen (ScreenPtr pScreen);
static void
cwValidateGC(GCPtr pGC, unsigned long stateChanges, DrawablePtr pDrawable);
@@ -673,7 +673,7 @@ miDisableCompositeWrapper(ScreenPtr pScreen)
}
static Bool
-cwCloseScreen (int i, ScreenPtr pScreen)
+cwCloseScreen (ScreenPtr pScreen)
{
cwScreenPtr pScreenPriv;
#ifdef RENDER
@@ -697,5 +697,5 @@ cwCloseScreen (int i, ScreenPtr pScreen)
free((void *)pScreenPriv);
- return (*pScreen->CloseScreen)(i, pScreen);
+ return (*pScreen->CloseScreen)(pScreen);
}
diff --git a/nx-X11/programs/Xserver/miext/damage/damage.c b/nx-X11/programs/Xserver/miext/damage/damage.c
index ca8128975..348adcb65 100644
--- a/nx-X11/programs/Xserver/miext/damage/damage.c
+++ b/nx-X11/programs/Xserver/miext/damage/damage.c
@@ -1717,7 +1717,7 @@ damageDestroyWindow (WindowPtr pWindow)
}
static Bool
-damageCloseScreen (int i, ScreenPtr pScreen)
+damageCloseScreen (ScreenPtr pScreen)
{
damageScrPriv(pScreen);
@@ -1729,7 +1729,7 @@ damageCloseScreen (int i, ScreenPtr pScreen)
unwrap (pScrPriv, pScreen, CloseScreen);
unwrap (pScrPriv, pScreen, BackingStoreFuncs.RestoreAreas);
free (pScrPriv);
- return (*pScreen->CloseScreen) (i, pScreen);
+ return (*pScreen->CloseScreen) (pScreen);
}
int damageScrPrivateIndex;