aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-06-27 20:38:10 +0200
committerUlrich Sibiller <uli42@gmx.de>2019-06-27 20:39:50 +0200
commit032ed3511bd6d2ef78c75e9296586ad5d469c0f1 (patch)
tree5a3f480a6373206e79c4a8f2797669e94bb05f5f /nx-X11
parentd487d5879d10211c5aa536b84073cdf9c64c2fed (diff)
downloadnx-libs-032ed3511bd6d2ef78c75e9296586ad5d469c0f1.tar.gz
nx-libs-032ed3511bd6d2ef78c75e9296586ad5d469c0f1.tar.bz2
nx-libs-032ed3511bd6d2ef78c75e9296586ad5d469c0f1.zip
Screen.c: use XlibWindow so silence the compiler
This is a bit weird, I'd expect far more places where the compiler could complain about Window vs Window64... But it does not. Screen.c:306:32: warning: passing argument 3 of ‘XQueryTree’ from incompatible pointer type [-Wincompatible-pointer-types] if (XQueryTree(d, candidate, &root, &parent, &children, &num_children)) ^~~~~ In file included from Screen.c:60: Agent.h:85:25: note: expected ‘Window64 *’ {aka ‘long unsigned int *’} but argument is of type ‘Window *’ {aka ‘unsigned int *’} #define Window Window64 ../../../../exports/include/nx-X11/Xlib.h:3041:5: note: in expansion of macro ‘Window’ Window* /* root_return */,
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Screen.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index 111fd96d4..44c89e03f 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -298,9 +298,9 @@ void nxagentSetPixmapFormats(ScreenInfo *screenInfo)
}
/* check if possible_parent is parent of candidate */
-Bool nxagentIsParentOf(Display *d, Window possible_parent, Window candidate)
+Bool nxagentIsParentOf(Display *d, XlibWindow possible_parent, XlibWindow candidate)
{
- Window parent, root, *children = NULL;
+ XlibWindow parent, root, *children = NULL;
unsigned int num_children;
if (XQueryTree(d, candidate, &root, &parent, &children, &num_children))