diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-03-27 16:39:28 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-03-27 16:39:28 +0200 |
| commit | 342758254b1b8507c9ec774f40d8ec62baf394a8 (patch) | |
| tree | 95baf987cc92dc8573d2f0da3d6e434355d887dc | |
| parent | d7d2aeea4b23f6abb3c51796d18261f11e7bd0ab (diff) | |
| download | nx-libs-342758254b1b8507c9ec774f40d8ec62baf394a8.tar.gz nx-libs-342758254b1b8507c9ec774f40d8ec62baf394a8.tar.bz2 nx-libs-342758254b1b8507c9ec774f40d8ec62baf394a8.zip | |
regression fix for 52872a0: Keep index parameter in AddScreen() for now. Requires proper ABI backport. (was: copy+paste error).
| -rw-r--r-- | nx-X11/programs/Xserver/dix/dispatch.c | 5 |
1 files changed, 3 insertions, 2 deletions
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--; |