From 55747d256d759850141e4a9c4dec965616a31dc8 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 18 Sep 2009 16:27:54 +1000 Subject: input: define server-supported protocol versions in one single file. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit include/protocol-versions.h specifies each extension version as supported by the server and sent back on the wire to the client. This fixes up several issues with the server potentially reporting a higher version of the protocol if recompiled against a newer version of the protocol. Signed-off-by: Peter Hutterer Acked-by: Rémi Cardona Acked-by: Julien Cristau --- render/render.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'render') diff --git a/render/render.c b/render/render.c index aadecf22e..a3067665e 100644 --- a/render/render.c +++ b/render/render.c @@ -45,6 +45,7 @@ #include #include "cursorstr.h" #include "xace.h" +#include "protocol-versions.h" #if HAVE_STDINT_H #include @@ -272,14 +273,14 @@ ProcRenderQueryVersion (ClientPtr client) rep.sequenceNumber = client->sequence; if ((stuff->majorVersion * 1000 + stuff->minorVersion) < - (RENDER_MAJOR * 1000 + RENDER_MINOR)) + (SERVER_RENDER_MAJOR_VERSION * 1000 + SERVER_RENDER_MINOR_VERSION)) { rep.majorVersion = stuff->majorVersion; rep.minorVersion = stuff->minorVersion; } else { - rep.majorVersion = RENDER_MAJOR; - rep.minorVersion = RENDER_MINOR; + rep.majorVersion = SERVER_RENDER_MAJOR_VERSION; + rep.minorVersion = SERVER_RENDER_MINOR_VERSION; } if (client->swapped) { -- cgit v1.2.3