diff options
| author | Adam Jackson <ajax@redhat.com> | 2008-08-20 13:14:03 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2008-08-20 13:14:34 -0400 |
| commit | 64ef7ed072007b1d0b4de5ff1e5eababa418c794 (patch) | |
| tree | bd3ada99281bf66cbad0fbef8a35c11658f628da | |
| parent | f1f44940f10b0209946ec0f08104a372d7d945a0 (diff) | |
Centralize declaration of ConnectionInfo.
| -rw-r--r-- | Xext/panoramiXh.h | 1 | ||||
| -rw-r--r-- | dix/dispatch.c | 1 | ||||
| -rw-r--r-- | dix/globals.c | 1 | ||||
| -rw-r--r-- | dix/main.c | 1 | ||||
| -rw-r--r-- | hw/dmx/dmxcb.c | 1 | ||||
| -rw-r--r-- | hw/xquartz/quartz.c | 1 | ||||
| -rw-r--r-- | include/globals.h | 2 | ||||
| -rw-r--r-- | randr/rrscreen.c | 2 | ||||
| -rw-r--r-- | render/render.c | 2 |
9 files changed, 3 insertions, 9 deletions
diff --git a/Xext/panoramiXh.h b/Xext/panoramiXh.h index 1a76a45cd..31b8f90b6 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 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; diff --git a/hw/dmx/dmxcb.c b/hw/dmx/dmxcb.c index 2ecfe22a3..4e7279a51 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 0635b48b5..c4b889ed0 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 607bc4805..971613987 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 f39197337..8cce5ee25 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 538697bb4..b1d6d5853 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) { |