diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-08-27 08:14:23 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-08-27 08:14:23 +0200 |
commit | 8b15d574b49857cdf4df0fd813d68b750d8aee5f (patch) | |
tree | 1d49cb2b80341523872cef6ccdb770d9d8d1f942 /nx-X11/programs/Xserver/dix | |
parent | f24767b3ccfa3f659846f78f32dd13e49dfb1752 (diff) | |
parent | 3563959c011c00dcbd9dace4d882b222aa31b27f (diff) | |
download | nx-libs-8b15d574b49857cdf4df0fd813d68b750d8aee5f.tar.gz nx-libs-8b15d574b49857cdf4df0fd813d68b750d8aee5f.tar.bz2 nx-libs-8b15d574b49857cdf4df0fd813d68b750d8aee5f.zip |
Merge branch 'uli42-pr/fix_background' into 3.6.x
Attributes GH PR #836: https://github.com/ArcticaProject/nx-libs/pull/836
Diffstat (limited to 'nx-X11/programs/Xserver/dix')
-rw-r--r-- | nx-X11/programs/Xserver/dix/window.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/dix/window.c b/nx-X11/programs/Xserver/dix/window.c index 79045767f..ee146d783 100644 --- a/nx-X11/programs/Xserver/dix/window.c +++ b/nx-X11/programs/Xserver/dix/window.c @@ -305,7 +305,6 @@ SetWindowToDefaults(register WindowPtr pWin) #endif } -#ifndef NXAGENT_SERVER static void MakeRootTile(WindowPtr pWin) { @@ -348,7 +347,6 @@ MakeRootTile(WindowPtr pWin) FreeScratchGC(pGC); } -#endif /* NXAGENT_SERVER */ WindowPtr AllocateWindow(ScreenPtr pScreen) |