summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2006-02-16 05:18:20 +0000
committerDave Airlie <airlied@linux.ie>2006-02-16 05:18:20 +0000
commitc2f685e64464ccf86ed47ae37f74bf46877e0739 (patch)
tree6d7c2f0bd7f9e7b671127268a863391b487f33cc
parent1bbd5e49b1dcc2e3f9785bd2bb58f946b9998099 (diff)
Fix XSERVER64 should be _XSERVER64
-rw-r--r--ChangeLog5
-rw-r--r--Xext/xres.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 98e0bd5f0..92859086a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-16 Dave Airlie <airlied@freedesktop.org>
+
+ * Xext/xres.c: (ProcXResQueryClientPixmapBytes):
+ Fix XSERVER64 should be _XSERVER64
+
2006-02-15 Eric Anholt <anholt@FreeBSD.org>
* XTrap/xtrapddmi.c:
diff --git a/Xext/xres.c b/Xext/xres.c
index 626306670..9f3624ba5 100644
--- a/Xext/xres.c
+++ b/Xext/xres.c
@@ -2,7 +2,7 @@
Copyright (c) 2002 XFree86 Inc
*/
/* $XFree86: xc/programs/Xserver/Xext/xres.c,v 1.7tsi Exp $ */
-/* $XdotOrg: xserver/xorg/Xext/xres.c,v 1.7 2005/07/03 08:53:36 daniels Exp $ */
+/* $XdotOrg: xserver/xorg/Xext/xres.c,v 1.8 2006/02/11 19:16:50 alanc Exp $ */
#define NEED_EVENTS
#define NEED_REPLIES
@@ -224,7 +224,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;