diff options
| author | Adam Jackson <ajax@redhat.com> | 2008-05-14 16:07:51 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2008-05-14 16:07:51 -0400 |
| commit | 07f69023b0e75d98a4be8f0d1c3dd9391b8149a0 (patch) | |
| tree | cc01e1eb2d0a266c47c31d8c19d96e48c60ca6f7 | |
| parent | 166177e36bfc7bd1df03663ad89500cff056d563 (diff) | |
Move defaultDisplayClass to xdmcp-only visibility.
| -rw-r--r-- | dix/globals.c | 1 | ||||
| -rw-r--r-- | os/xdmcp.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/dix/globals.c b/dix/globals.c index 2eca277bd..210c7849c 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 310f33bc0..40c50540e 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; |