From b07d79614dd27e62159ca52bb1496b550a5a7d83 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@benzedrine.nwnk.net>
Date: Wed, 8 Nov 2006 12:03:37 -0500
Subject: [PATCH] Bug #6786: Use separate defines for server's Fixes support
 level. (cherry picked from 7e0aeebb8f8a5dff3cb4d88756e535dd70edeec4 commit)

---
 xfixes/xfixes.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/xfixes/xfixes.c b/xfixes/xfixes.c
index a0e656dd8..cee9e096d 100755
--- a/xfixes/xfixes.c
+++ b/xfixes/xfixes.c
@@ -48,6 +48,13 @@
 
 #include "xfixesint.h"
 
+/*
+ * Must use these instead of the constants from xfixeswire.h.  They advertise
+ * what we implement, not what the protocol headers define.
+ */
+#define SERVER_XFIXES_MAJOR 4
+#define SERVER_XFIXES_MINOR 0
+
 unsigned char	XFixesReqCode;
 int		XFixesEventBase;
 int		XFixesErrorBase;
@@ -65,16 +72,16 @@ ProcXFixesQueryVersion(ClientPtr client)
     rep.type = X_Reply;
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
-    if (stuff->majorVersion < XFIXES_MAJOR) {
+    if (stuff->majorVersion < SERVER_XFIXES_MAJOR) {
 	rep.majorVersion = stuff->majorVersion;
 	rep.minorVersion = stuff->minorVersion;
     } else {
-	rep.majorVersion = XFIXES_MAJOR;
-	if (stuff->majorVersion == XFIXES_MAJOR && 
-	    stuff->minorVersion < XFIXES_MINOR)
+	rep.majorVersion = SERVER_XFIXES_MAJOR;
+	if (stuff->majorVersion == SERVER_XFIXES_MAJOR && 
+	    stuff->minorVersion < SERVER_XFIXES_MINOR)
 	    rep.minorVersion = stuff->minorVersion;
 	else
-	    rep.minorVersion = XFIXES_MINOR;
+	    rep.minorVersion = SERVER_XFIXES_MINOR;
     }
     pXFixesClient->major_version = rep.majorVersion;
     pXFixesClient->minor_version = rep.minorVersion;