diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-20 11:16:08 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-21 04:06:28 +0200 |
| commit | 590862d39d6e7cea6425416a5ef6fa2e747bcc0c (patch) | |
| tree | 2e0163b52a1ae67879bc2338ba88733c55711eda /nx-X11/programs | |
| parent | 560fd4e5f9ab33a92776d0de512e551f2895994f (diff) | |
| download | nx-libs-590862d39d6e7cea6425416a5ef6fa2e747bcc0c.tar.gz nx-libs-590862d39d6e7cea6425416a5ef6fa2e747bcc0c.tar.bz2 nx-libs-590862d39d6e7cea6425416a5ef6fa2e747bcc0c.zip | |
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>
Diffstat (limited to 'nx-X11/programs')
| -rw-r--r-- | nx-X11/programs/Xserver/dix/globals.c | 2 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/dix/main.c | 1 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/include/globals.h | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/dix/globals.c b/nx-X11/programs/Xserver/dix/globals.c index e4f43fd01..9d9e8bfe7 100644 --- 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; diff --git a/nx-X11/programs/Xserver/dix/main.c b/nx-X11/programs/Xserver/dix/main.c index 6a5b0021d..050da899e 100644 --- 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; diff --git a/nx-X11/programs/Xserver/include/globals.h b/nx-X11/programs/Xserver/include/globals.h index 853b63e86..5513b82d0 100644 --- 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]; |