Centralize declaration of ConnectionInfo.

Backported from X.org: commit 64ef7ed072007b1d0b4de5ff1e5eababa418c794 Author: Adam Jackson <ajax@redhat.com> Date: Wed Aug 20 13:14:03 2008 -0400 Centralize declaration of ConnectionInfo. Author: Adam Jackson <ajax@redhat.com> Backport to nx-libs: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

Centralize declaration of ConnectionInfo.
590862d3 · Mike Gabriel · 560fd4e5 · 590862d3 · 590862d3 · 590862d3
Commit 590862d3 authored Jun 20, 2016 by Mike Gabriel
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

globals.c nx-X11/programs/Xserver/dix/globals.c +2 -0

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

globals.h nx-X11/programs/Xserver/include/globals.h +1 -0

No files found.
--- a/nx-X11/programs/Xserver/dix/globals.c
+++ b/nx-X11/programs/Xserver/dix/globals.c
@@ -161,3 +161,5 @@ int	argcGlobal;
 char	**argvGlobal;

 DDXPointRec dixScreenOrigins[MAXSCREENS];
+
+char *ConnectionInfo;
--- a/nx-X11/programs/Xserver/dix/main.c
+++ b/nx-X11/programs/Xserver/dix/main.c
@@ -121,7 +121,6 @@ extern int InitClientPrivates(ClientPtr client);

 extern void Dispatch(void);

-char *ConnectionInfo;
 xConnSetupPrefix connSetupPrefix;

 extern FontPtr defaultFont;

--- a/nx-X11/programs/Xserver/include/globals.h
+++ b/nx-X11/programs/Xserver/include/globals.h
@@ -22,6 +22,7 @@ extern int defaultColorVisualClass;
 extern Bool Must_have_memory;
 extern WindowPtr *WindowTable;
 extern int GrabInProgress;
+extern char *ConnectionInfo;
 extern Bool noTestExtensions;

 extern DDXPointRec dixScreenOrigins[MAXSCREENS];