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/composite | |
| 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/composite')
| -rw-r--r-- | nx-X11/programs/Xserver/composite/compinit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/composite/compinit.c b/nx-X11/programs/Xserver/composite/compinit.c index c4d069dae..ff2137887 100644 --- a/nx-X11/programs/Xserver/composite/compinit.c +++ b/nx-X11/programs/Xserver/composite/compinit.c @@ -40,7 +40,7 @@ int CompSubwindowsPrivIndex = -1; #endif static Bool -compCloseScreen (int index, ScreenPtr pScreen) +compCloseScreen (ScreenPtr pScreen) { CompScreenPtr cs = GetCompScreen (pScreen); Bool ret; @@ -78,7 +78,7 @@ compCloseScreen (int index, ScreenPtr pScreen) free (cs); FAKE_DIX_SET_SCREEN_PRIVATE(pScreen, NULL); - ret = (*pScreen->CloseScreen) (index, pScreen); + ret = (*pScreen->CloseScreen) (pScreen); return ret; } |