Centralize declaration of ConnectionInfo.

This commit is contained in:
Adam Jackson 2008-08-20 13:14:03 -04:00
parent f1f44940f1
commit 64ef7ed072
9 changed files with 3 additions and 9 deletions

View File

@ -67,7 +67,6 @@ PROC_EXTERN(ProcXineramaIsActive);
extern int SProcPanoramiXDispatch(ClientPtr client); extern int SProcPanoramiXDispatch(ClientPtr client);
extern char *ConnectionInfo;
extern int connBlockScreenStart; extern int connBlockScreenStart;
extern xConnSetupPrefix connSetupPrefix; extern xConnSetupPrefix connSetupPrefix;

View File

@ -160,7 +160,6 @@ typedef const char *string;
#define GETBIT(buf, i) (MASKWORD(buf, i) & BITMASK(i)) #define GETBIT(buf, i) (MASKWORD(buf, i) & BITMASK(i))
extern xConnSetupPrefix connSetupPrefix; extern xConnSetupPrefix connSetupPrefix;
extern char *ConnectionInfo;
static ClientPtr grabClient; static ClientPtr grabClient;
#define GrabNone 0 #define GrabNone 0

View File

@ -149,6 +149,7 @@ _X_EXPORT int defaultColorVisualClass = -1;
_X_EXPORT int monitorResolution = 0; _X_EXPORT int monitorResolution = 0;
_X_EXPORT char *display; _X_EXPORT char *display;
char *ConnectionInfo;
CARD32 TimeOutValue = DEFAULT_TIMEOUT * MILLI_PER_SECOND; CARD32 TimeOutValue = DEFAULT_TIMEOUT * MILLI_PER_SECOND;

View File

@ -118,7 +118,6 @@ Equipment Corporation.
extern void Dispatch(void); extern void Dispatch(void);
char *ConnectionInfo;
xConnSetupPrefix connSetupPrefix; xConnSetupPrefix connSetupPrefix;
extern FontPtr defaultFont; extern FontPtr defaultFont;

View File

@ -43,7 +43,6 @@
#include "dmxinput.h" #include "dmxinput.h"
#include "dmxlog.h" #include "dmxlog.h"
extern char *ConnectionInfo;
extern int connBlockScreenStart; extern int connBlockScreenStart;
#ifdef PANORAMIX #ifdef PANORAMIX

View File

@ -184,7 +184,6 @@ void QuartzInitInput(
#ifdef FAKE_RANDR #ifdef FAKE_RANDR
extern char *ConnectionInfo;
static int padlength[4] = {0, 3, 2, 1}; static int padlength[4] = {0, 3, 2, 1};

View File

@ -26,6 +26,8 @@ extern Bool noTestExtensions;
extern DDXPointRec dixScreenOrigins[MAXSCREENS]; extern DDXPointRec dixScreenOrigins[MAXSCREENS];
extern char *ConnectionInfo;
#ifdef DPMSExtension #ifdef DPMSExtension
extern CARD32 defaultDPMSStandbyTime; extern CARD32 defaultDPMSStandbyTime;
extern CARD32 defaultDPMSSuspendTime; extern CARD32 defaultDPMSSuspendTime;

View File

@ -22,8 +22,6 @@
#include "randrstr.h" #include "randrstr.h"
extern char *ConnectionInfo;
static int padlength[4] = {0, 3, 2, 1}; static int padlength[4] = {0, 3, 2, 1};
static CARD16 static CARD16

View File

@ -297,8 +297,6 @@ findVisual (ScreenPtr pScreen, VisualID vid)
return 0; return 0;
} }
extern char *ConnectionInfo;
static int static int
ProcRenderQueryPictFormats (ClientPtr client) ProcRenderQueryPictFormats (ClientPtr client)
{ {