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 8ebb5d23c931810335739be16c1b10f44ed3c4d0 Author: Ulrich Sibiller <uli42@gmx.de> Date: Sat Oct 21 02:47:07 2017 +0200 Xext: lift xres.c to xorg-xserver-7.1/1.1 state Fix XSERVER64 should be _XSERVER64 --- nx-X11/programs/Xserver/Xext/xres.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nx-X11/programs/Xserver/Xext/xres.c b/nx-X11/programs/Xserver/Xext/xres.c index ceb9c65..03597ad 100644 --- a/nx-X11/programs/Xserver/Xext/xres.c +++ b/nx-X11/programs/Xserver/Xext/xres.c @@ -6,6 +6,8 @@ #include <dix-config.h> #endif +#include <stdio.h> +#include <string.h> #include <nx-X11/X.h> #include <nx-X11/Xproto.h> #include "misc.h" @@ -206,7 +208,7 @@ ProcXResQueryClientPixmapBytes (ClientPtr client) rep.sequenceNumber = client->sequence; rep.length = 0; rep.bytes = bytes; -#ifdef XSERVER64 +#ifdef _XSERVER64 rep.bytes_overflow = bytes >> 32; #else rep.bytes_overflow = 0; -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git