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/mioverlay.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/mioverlay.c')
-rw-r--r-- | nx-X11/programs/Xserver/mi/mioverlay.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/mi/mioverlay.c b/nx-X11/programs/Xserver/mi/mioverlay.c index 796df6ebd..c0d923a0f 100644 --- a/nx-X11/programs/Xserver/mi/mioverlay.c +++ b/nx-X11/programs/Xserver/mi/mioverlay.c @@ -62,7 +62,7 @@ static Bool HasUnderlayChildren(WindowPtr); static void MarkUnderlayWindow(WindowPtr); static Bool CollectUnderlayChildrenRegions(WindowPtr, RegionPtr); -static Bool miOverlayCloseScreen(int, ScreenPtr); +static Bool miOverlayCloseScreen(ScreenPtr); static Bool miOverlayCreateWindow(WindowPtr); static Bool miOverlayDestroyWindow(WindowPtr); static Bool miOverlayUnrealizeWindow(WindowPtr); @@ -167,7 +167,7 @@ miInitOverlay( static Bool -miOverlayCloseScreen(int i, ScreenPtr pScreen) +miOverlayCloseScreen(ScreenPtr pScreen) { miOverlayScreenPtr pScreenPriv = MIOVERLAY_GET_SCREEN_PRIVATE(pScreen); @@ -179,7 +179,7 @@ miOverlayCloseScreen(int i, ScreenPtr pScreen) free(pScreenPriv); - return (*pScreen->CloseScreen)(i, pScreen); + return (*pScreen->CloseScreen)(pScreen); } |