diff options
| author | marha <marha@users.sourceforge.net> | 2014-04-13 14:28:06 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-04-13 14:28:06 +0200 |
| commit | 0bd141efd4832e01c8b269b8566dd5749e30ed55 (patch) | |
| tree | cdad95c688236c6e2e36f13a3495c498393dabc8 /xorg-server/dix/globals.c | |
| parent | feab85024204c7db3ad243697fe06bf3960349a9 (diff) | |
| parent | d2ad10d03be8e6d4b150bbdf2a28ea3d5a18a2ed (diff) | |
| download | vcxsrv-0bd141efd4832e01c8b269b8566dd5749e30ed55.tar.gz vcxsrv-0bd141efd4832e01c8b269b8566dd5749e30ed55.tar.bz2 vcxsrv-0bd141efd4832e01c8b269b8566dd5749e30ed55.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/dix/globals.c')
| -rw-r--r-- | xorg-server/dix/globals.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xorg-server/dix/globals.c b/xorg-server/dix/globals.c index 9738e9cdf..eaa2afe24 100644 --- a/xorg-server/dix/globals.c +++ b/xorg-server/dix/globals.c @@ -127,7 +127,8 @@ int defaultColorVisualClass = -1; int monitorResolution = 0; const char *display; -int displayfd; +int displayfd = -1; +Bool explicit_display = FALSE; char *ConnectionInfo; CARD32 TimeOutValue = DEFAULT_TIMEOUT * MILLI_PER_SECOND; |