xserver: Branch 'master'

[Adam Jackson]

 Xext/panoramiXh.h   |    1 -
 dix/dispatch.c      |    1 -
 dix/globals.c       |    1 +
 dix/main.c          |    1 -
 hw/dmx/dmxcb.c      |    1 -
 hw/xquartz/quartz.c |    1 -
 include/globals.h   |    2 ++
 randr/rrscreen.c    |    2 --
 render/render.c     |    2 --
 9 files changed, 3 insertions(+), 9 deletions(-)

New commits:
commit 64ef7ed072007b1d0b4de5ff1e5eababa418c794
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Aug 20 13:14:03 2008 -0400

    Centralize declaration of ConnectionInfo.

diff --git a/Xext/panoramiXh.h b/Xext/panoramiXh.h
index 1a76a45..31b8f90 100644
--- a/Xext/panoramiXh.h
+++ b/Xext/panoramiXh.h
@@ -67,7 +67,6 @@ PROC_EXTERN(ProcXineramaIsActive);
 
 extern int SProcPanoramiXDispatch(ClientPtr client);
 
-extern char *ConnectionInfo;
 extern int connBlockScreenStart;
 extern xConnSetupPrefix connSetupPrefix;
 
diff --git a/dix/dispatch.c b/dix/dispatch.c
index 202d2d9..8b7fe4b 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 a9134c3..630d291 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 ac8e0f2..267aba5 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;
diff --git a/hw/dmx/dmxcb.c b/hw/dmx/dmxcb.c
index 2ecfe22..4e7279a 100644
--- a/hw/dmx/dmxcb.c
+++ b/hw/dmx/dmxcb.c
@@ -43,7 +43,6 @@
 #include "dmxinput.h"
 #include "dmxlog.h"
 
-extern char    *ConnectionInfo;
 extern int     connBlockScreenStart;
 
 #ifdef PANORAMIX
diff --git a/hw/xquartz/quartz.c b/hw/xquartz/quartz.c
index 0635b48..c4b889e 100644
--- a/hw/xquartz/quartz.c
+++ b/hw/xquartz/quartz.c
@@ -184,7 +184,6 @@ void QuartzInitInput(
 
 
 #ifdef FAKE_RANDR
-extern char	*ConnectionInfo;
 
 static int padlength[4] = {0, 3, 2, 1};
 
diff --git a/include/globals.h b/include/globals.h
index 607bc48..9716139 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -26,6 +26,8 @@ extern Bool noTestExtensions;
 
 extern DDXPointRec dixScreenOrigins[MAXSCREENS];
 
+extern char *ConnectionInfo;
+
 #ifdef DPMSExtension
 extern CARD32 defaultDPMSStandbyTime;
 extern CARD32 defaultDPMSSuspendTime;
diff --git a/randr/rrscreen.c b/randr/rrscreen.c
index f391973..8cce5ee 100644
--- a/randr/rrscreen.c
+++ b/randr/rrscreen.c
@@ -22,8 +22,6 @@
 
 #include "randrstr.h"
 
-extern char	*ConnectionInfo;
-
 static int padlength[4] = {0, 3, 2, 1};
 
 static CARD16
diff --git a/render/render.c b/render/render.c
index 538697b..b1d6d58 100644
--- a/render/render.c
+++ b/render/render.c
@@ -297,8 +297,6 @@ findVisual (ScreenPtr pScreen, VisualID vid)
     return 0;
 }
 
-extern char *ConnectionInfo;
-
 static int
 ProcRenderQueryPictFormats (ClientPtr client)
 {