diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2019-12-29 00:56:36 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-01-06 00:50:30 +0100 |
| commit | b8b897e3f0aff790ccdd927fe1e8c79f92b49ffa (patch) | |
| tree | 64f690ac3f72afcb8243fb1cae5c91c2c17d55eb | |
| parent | 12358d64a44889eef243eb316ca1ac962cca5422 (diff) | |
| download | nx-libs-b8b897e3f0aff790ccdd927fe1e8c79f92b49ffa.tar.gz nx-libs-b8b897e3f0aff790ccdd927fe1e8c79f92b49ffa.tar.bz2 nx-libs-b8b897e3f0aff790ccdd927fe1e8c79f92b49ffa.zip | |
Remove the numVideoScreens xprintism.
Backport of this xorg-xserver commit:
commit a82e6efb7b9b2ab9a1597b002f375c5ee105e7f5
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 16 14:19:04 2008 -0400
Remove the numVideoScreens xprintism.
This was to account for cases where you had video and print screens in
the same server. Lunacy. Leave the slot in ScreenInfo, but rename it,
and stop looking at it.
| -rw-r--r-- | nx-X11/programs/Xserver/dix/main.c | 3 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/include/scrnintstr.h | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/dix/main.c b/nx-X11/programs/Xserver/dix/main.c index d425872df..1ae51fc81 100644 --- a/nx-X11/programs/Xserver/dix/main.c +++ b/nx-X11/programs/Xserver/dix/main.c @@ -254,7 +254,6 @@ main(int argc, char *argv[], char *envp[]) SetInputCheck(&alwaysCheckForInput[0], &alwaysCheckForInput[1]); screenInfo.arraySize = MAXSCREENS; screenInfo.numScreens = 0; - screenInfo.numVideoScreens = -1; InitAtoms(); InitEvents(); @@ -280,8 +279,6 @@ main(int argc, char *argv[], char *envp[]) if (screenInfo.numScreens < 1) FatalError("no screens found"); - if (screenInfo.numVideoScreens < 0) - screenInfo.numVideoScreens = screenInfo.numScreens; InitExtensions(argc, argv); if (!InitClientPrivates(serverClient)) FatalError("failed to allocate serverClient devprivates"); diff --git a/nx-X11/programs/Xserver/include/scrnintstr.h b/nx-X11/programs/Xserver/include/scrnintstr.h index 5a3f32309..d52fb4960 100644 --- a/nx-X11/programs/Xserver/include/scrnintstr.h +++ b/nx-X11/programs/Xserver/include/scrnintstr.h @@ -743,7 +743,7 @@ typedef struct _ScreenInfo { int arraySize; int numScreens; ScreenPtr screens[MAXSCREENS]; - int numVideoScreens; + int unused; } ScreenInfo; extern ScreenInfo screenInfo; |