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.

Remove the numVideoScreens xprintism.
b8b897e3 · Ulrich Sibiller · Mike Gabriel · 12358d64 · b8b897e3 · b8b897e3
Commit b8b897e3 authored Dec 29, 2019 by Ulrich Sibiller Committed by Mike Gabriel Jan 06, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

main.c nx-X11/programs/Xserver/dix/main.c +0 -3

scrnintstr.h nx-X11/programs/Xserver/include/scrnintstr.h +1 -1

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

--- 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;