xserver: Branch 'master'
Adam Jackson
ajax at kemper.freedesktop.org
Wed May 14 13:08:15 PDT 2008
dix/globals.c | 1 -
os/xdmcp.c | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 07f69023b0e75d98a4be8f0d1c3dd9391b8149a0
Author: Adam Jackson <ajax at redhat.com>
Date: Wed May 14 16:07:51 2008 -0400
Move defaultDisplayClass to xdmcp-only visibility.
diff --git a/dix/globals.c b/dix/globals.c
index 2eca277..210c784 100644
--- a/dix/globals.c
+++ b/dix/globals.c
@@ -136,7 +136,6 @@ Bool screenSaverSuspended = FALSE;
char *defaultFontPath = COMPILEDDEFAULTFONTPATH;
char *defaultTextFont = COMPILEDDEFAULTFONT;
char *defaultCursorFont = COMPILEDCURSORFONT;
-char *defaultDisplayClass = COMPILEDDISPLAYCLASS;
FontPtr defaultFont; /* not declared in dix.h to avoid including font.h in
every compilation of dix code */
CursorPtr rootCursor;
diff --git a/os/xdmcp.c b/os/xdmcp.c
index 310f33b..40c5054 100644
--- a/os/xdmcp.c
+++ b/os/xdmcp.c
@@ -68,7 +68,7 @@
#define X_INCLUDE_NETDB_H
#include <X11/Xos_r.h>
-extern char *defaultDisplayClass;
+static char *defaultDisplayClass = COMPILEDDISPLAYCLASS;
static int xdmcpSocket, sessionSocket;
static xdmcp_states state;
More information about the xorg-commit
mailing list