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

Revert "regression fix for 52872a0d: Keep index parameter in AddScreen() for now. Requires proper ABI backport. (was: copy+paste error)." This reverts commit 34275825. Other than stated in the original commit msg, both regressions are related to inproper rebasing of two pull requests touch the same code portion.

Revert "regression fix for 52872a0d: Keep index parameter in AddScreen() for now.…
9e2588e5 · Mike Gabriel · 5421dd44 · 9e2588e5
Commit 9e2588e5 authored Apr 10, 2017 by Mike Gabriel
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

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

No files found.
--- a/nx-X11/programs/Xserver/dix/dispatch.c
+++ b/nx-X11/programs/Xserver/dix/dispatch.c
@@ -4135,8 +4135,7 @@ void FreeScreen(ScreenPtr);
 */

 int
-AddScreen(Bool (*pfnInit) (int /*index*/ ,
-                           ScreenPtr /*pScreen */ ,
+AddScreen(Bool (*pfnInit) (ScreenPtr /*pScreen */ ,
                           int /*argc */ ,
                           char **      /*argv */
          ), int argc, char **argv)
@@ -4175,7 +4174,7 @@ AddScreen(Bool (*pfnInit) (int /*index*/ ,
    pScreen->rgf = ~0L;  /* there are no scratch GCs yet*/
    screenInfo.screens[i] = pScreen;
    screenInfo.numScreens++;
-    if (!(*pfnInit)(i, pScreen, argc, argv))
+    if (!(*pfnInit)(pScreen, argc, argv))
    {
    FreeScreen(pScreen);
    screenInfo.numScreens--;