diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-03-22 00:40:55 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-03-22 00:40:55 +0100 |
| commit | f5e7d555ad58368cb550b4516b75a1ac3765fda2 (patch) | |
| tree | 000ba384ea14d1c4ba4b8023b37ec57f95c88f58 /nx-X11/programs/Xserver/dix/globals.c | |
| parent | b7c389b9a0fa366a40ab272a9429a52ecee7365d (diff) | |
| parent | 565421ba18a09d20620e01fc877915a8b09a3735 (diff) | |
| download | nx-libs-f5e7d555ad58368cb550b4516b75a1ac3765fda2.tar.gz nx-libs-f5e7d555ad58368cb550b4516b75a1ac3765fda2.tar.bz2 nx-libs-f5e7d555ad58368cb550b4516b75a1ac3765fda2.zip | |
Merge branch 'sunweaver-pr/various-os-backports' into 3.6.x
Attributes GH PR #376: https://github.com/ArcticaProject/nx-libs/pull/376
Diffstat (limited to 'nx-X11/programs/Xserver/dix/globals.c')
| -rw-r--r-- | nx-X11/programs/Xserver/dix/globals.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/dix/globals.c b/nx-X11/programs/Xserver/dix/globals.c index a0af50fa8..f9fa544ed 100644 --- a/nx-X11/programs/Xserver/dix/globals.c +++ b/nx-X11/programs/Xserver/dix/globals.c @@ -149,6 +149,8 @@ int defaultColorVisualClass = -1; int monitorResolution = 0; char *display; +int displayfd = -1; +Bool explicit_display = FALSE; CARD32 TimeOutValue = DEFAULT_TIMEOUT * MILLI_PER_SECOND; int argcGlobal; |