[X2Go-Commits] [nx-libs] 129/219: Screen.c: use XlibWindow so silence the compiler

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 032ed3511bd6d2ef78c75e9296586ad5d469c0f1
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Thu Jun 27 20:38:10 2019 +0200

    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 */,
---
 nx-X11/programs/Xserver/hw/nxagent/Screen.c | 4 ++--
 1 file 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))

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git