regression fix for 52872a0d: Keep index parameter in AddScreen() for now.…

regression fix for 52872a0d: Keep index parameter in AddScreen() for now. Requires proper ABI backport. (was: copy+paste error).

regression fix for 52872a0d: Keep index parameter in AddScreen() for now.…
34275825 · Mike Gabriel · d7d2aeea · 34275825
Commit 34275825 authored Mar 27, 2017 by Mike Gabriel
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

dispatch.c nx-X11/programs/Xserver/dix/dispatch.c +3 -2

No files found.
--- 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--;