Skip to content

N
nx-libs
Commit 590862d3 authored by Mike Gabriel's avatar Mike Gabriel
Browse files
Options

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>
parent 560fd4e5
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
nx-X11/programs/Xserver/dix/globals.c
View file @ 590862d3
...@@ -161,3 +161,5 @@ int argcGlobal; ...@@ -161,3 +161,5 @@ int argcGlobal;
char **argvGlobal; char **argvGlobal;
DDXPointRec dixScreenOrigins[MAXSCREENS]; DDXPointRec dixScreenOrigins[MAXSCREENS];
char *ConnectionInfo;
nx-X11/programs/Xserver/dix/main.c
View file @ 590862d3
...@@ -121,7 +121,6 @@ extern int InitClientPrivates(ClientPtr client); ...@@ -121,7 +121,6 @@ extern int InitClientPrivates(ClientPtr client);
extern void Dispatch(void); extern void Dispatch(void);
char *ConnectionInfo;
xConnSetupPrefix connSetupPrefix; xConnSetupPrefix connSetupPrefix;
extern FontPtr defaultFont; extern FontPtr defaultFont;
......
nx-X11/programs/Xserver/include/globals.h
View file @ 590862d3
...@@ -22,6 +22,7 @@ extern int defaultColorVisualClass; ...@@ -22,6 +22,7 @@ extern int defaultColorVisualClass;
extern Bool Must_have_memory; extern Bool Must_have_memory;
extern WindowPtr *WindowTable; extern WindowPtr *WindowTable;
extern int GrabInProgress; extern int GrabInProgress;
extern char *ConnectionInfo;
extern Bool noTestExtensions; extern Bool noTestExtensions;
extern DDXPointRec dixScreenOrigins[MAXSCREENS]; extern DDXPointRec dixScreenOrigins[MAXSCREENS];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment