summaryrefslogtreecommitdiff
path: root/dix
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2008-08-20 13:14:03 -0400
committerAdam Jackson <ajax@redhat.com>2008-08-20 13:14:34 -0400
commit64ef7ed072007b1d0b4de5ff1e5eababa418c794 (patch)
treebd3ada99281bf66cbad0fbef8a35c11658f628da /dix
parentf1f44940f10b0209946ec0f08104a372d7d945a0 (diff)
Centralize declaration of ConnectionInfo.
Diffstat (limited to 'dix')
-rw-r--r--dix/dispatch.c1
-rw-r--r--dix/globals.c1
-rw-r--r--dix/main.c1
3 files changed, 1 insertions, 2 deletions
diff --git a/dix/dispatch.c b/dix/dispatch.c
index 202d2d99d..8b7fe4bb0 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -160,7 +160,6 @@ typedef const char *string;
#define GETBIT(buf, i) (MASKWORD(buf, i) & BITMASK(i))
extern xConnSetupPrefix connSetupPrefix;
-extern char *ConnectionInfo;
static ClientPtr grabClient;
#define GrabNone 0
diff --git a/dix/globals.c b/dix/globals.c
index a9134c39a..630d29167 100644
--- a/dix/globals.c
+++ b/dix/globals.c
@@ -149,6 +149,7 @@ _X_EXPORT int defaultColorVisualClass = -1;
_X_EXPORT int monitorResolution = 0;
_X_EXPORT char *display;
+char *ConnectionInfo;
CARD32 TimeOutValue = DEFAULT_TIMEOUT * MILLI_PER_SECOND;
diff --git a/dix/main.c b/dix/main.c
index ac8e0f2e7..267aba5d1 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -118,7 +118,6 @@ Equipment Corporation.
extern void Dispatch(void);
-char *ConnectionInfo;
xConnSetupPrefix connSetupPrefix;
extern FontPtr defaultFont;