From 342758254b1b8507c9ec774f40d8ec62baf394a8 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 27 Mar 2017 16:39:28 +0200 Subject: regression fix for 52872a0: Keep index parameter in AddScreen() for now. Requires proper ABI backport. (was: copy+paste error). --- nx-X11/programs/Xserver/dix/dispatch.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'nx-X11') diff --git a/nx-X11/programs/Xserver/dix/dispatch.c b/nx-X11/programs/Xserver/dix/dispatch.c index 8294a583a..09b209e66 100644 --- a/nx-X11/programs/Xserver/dix/dispatch.c +++ b/nx-X11/programs/Xserver/dix/dispatch.c @@ -4135,7 +4135,8 @@ void FreeScreen(ScreenPtr); */ int -AddScreen(Bool (*pfnInit) (ScreenPtr /*pScreen */ , +AddScreen(Bool (*pfnInit) (int /*index*/ , + ScreenPtr /*pScreen */ , int /*argc */ , char ** /*argv */ ), int argc, char **argv) @@ -4174,7 +4175,7 @@ AddScreen(Bool (*pfnInit) (ScreenPtr /*pScreen */ , pScreen->rgf = ~0L; /* there are no scratch GCs yet*/ screenInfo.screens[i] = pScreen; screenInfo.numScreens++; - if (!(*pfnInit)(pScreen, argc, argv)) + if (!(*pfnInit)(i, pScreen, argc, argv)) { FreeScreen(pScreen); screenInfo.numScreens--; -- cgit v1.2.3