diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-01-16 00:19:38 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-01-16 00:19:38 +0100 |
| commit | b66699555d2e2503926f01a9c192481e01812399 (patch) | |
| tree | fa7f275b0bc74c3ed8e85538602ed8b6a8a0f4c2 /nx-X11/programs/Xserver/hw/nxagent/Window.c | |
| parent | 3523d15e2a9f84e2136e3370129a9bea0e16e072 (diff) | |
| parent | 97a69b95ac3018f9a8838b09df28a0f33c484a0d (diff) | |
| download | nx-libs-b66699555d2e2503926f01a9c192481e01812399.tar.gz nx-libs-b66699555d2e2503926f01a9c192481e01812399.tar.bz2 nx-libs-b66699555d2e2503926f01a9c192481e01812399.zip | |
Merge branch 'uli42-pr/various6' into 3.6.x
Attributes GH PR #979: https://github.com/ArcticaProject/nx-libs/pull/979
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Window.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Window.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c index a30eac589..e1a0776ad 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Window.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c @@ -110,8 +110,6 @@ extern WindowPtr nxagentViewportFrameRight; extern WindowPtr nxagentViewportFrameAbove; extern WindowPtr nxagentViewportFrameBelow; -extern WindowPtr nxagentRootTileWindow; - extern Bool nxagentReportPrivateWindowIds; #define RECTLIMIT 25 @@ -1532,7 +1530,7 @@ void nxagentConfigureWindow(WindowPtr pWin, unsigned int mask) * position in the window tree, and pPriorParent is its previous * parent. This function can be NULL. * - * We simply pass this pver to the real X server. + * We simply pass this over to the real X server. */ void nxagentReparentWindow(WindowPtr pWin, WindowPtr pOldParent) { @@ -3907,7 +3905,7 @@ StoringPixmapPtr nxagentFindItemBSPixmapList(unsigned long pixmapId) } } - #ifdef WARNING + #ifdef TEST fprintf(stderr, "%s: WARNING! Item not found.\n", __func__); #endif |