aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/Xext/xres.c
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2018-02-07 23:19:33 +0100
committerMihai Moldovan <ionic@ionic.de>2018-02-07 23:19:33 +0100
commitaecdb52661898d0ba400a61550fa6ce9c0a4d829 (patch)
treef3c82763aa3f6c19da425e75c5c37dae228f38b4 /nx-X11/programs/Xserver/Xext/xres.c
parentcbdae3b71bfc654cfc0c81b1ddf51975bcb93146 (diff)
parent5ec2366c40a540245be4a643fcf740fb16bcec50 (diff)
downloadnx-libs-aecdb52661898d0ba400a61550fa6ce9c0a4d829.tar.gz
nx-libs-aecdb52661898d0ba400a61550fa6ce9c0a4d829.tar.bz2
nx-libs-aecdb52661898d0ba400a61550fa6ce9c0a4d829.zip
Merge branch 'uli42-pr/update_xext' into 3.6.x
Attributes GH PR #643: https://github.com/ArcticaProject/nx-libs/pull/643
Diffstat (limited to 'nx-X11/programs/Xserver/Xext/xres.c')
-rw-r--r--nx-X11/programs/Xserver/Xext/xres.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/Xext/xres.c b/nx-X11/programs/Xserver/Xext/xres.c
index ceb9c65d4..03597ad95 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;