diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-04-10 16:01:02 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-04-10 16:01:02 +0200 |
| commit | 9e2588e56f5b712c4501a19c1f723257c05aa6af (patch) | |
| tree | b84dac767f6b6ae7027c02fce55fa59a9991ea23 | |
| parent | 5421dd444422df233c2bba82b994ce8f8d677044 (diff) | |
| download | nx-libs-9e2588e56f5b712c4501a19c1f723257c05aa6af.tar.gz nx-libs-9e2588e56f5b712c4501a19c1f723257c05aa6af.tar.bz2 nx-libs-9e2588e56f5b712c4501a19c1f723257c05aa6af.zip | |
Revert "regression fix for 52872a0: Keep index parameter in AddScreen() for now. Requires proper ABI backport. (was: copy+paste error)."
This reverts commit 342758254b1b8507c9ec774f40d8ec62baf394a8.
Other than stated in the original commit msg, both regressions are
related to inproper rebasing of two pull requests touch the same code
portion.
| -rw-r--r-- | nx-X11/programs/Xserver/dix/dispatch.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/dix/dispatch.c b/nx-X11/programs/Xserver/dix/dispatch.c index 09b209e66..8294a583a 100644 --- 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--; |