diff options
author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-09-18 16:27:54 +1000 |
---|---|---|
committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-09-21 21:47:35 +1000 |
commit | 55747d256d759850141e4a9c4dec965616a31dc8 (patch) | |
tree | b9f140d3bbca93f3028cf2340271789fd1d92e6d /Xext/geext.c | |
parent | 0b7c6c728c2e2d8433a188315cc591308a89cd85 (diff) |
input: define server-supported protocol versions in one single file.
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 <peter.hutterer@who-t.net>
Acked-by: RĂ©mi Cardona <remi@gentoo.org>
Acked-by: Julien Cristau <jcristau@debian.org>
Diffstat (limited to 'Xext/geext.c')
-rw-r--r-- | Xext/geext.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Xext/geext.c b/Xext/geext.c index 1ddcbb1f6..6fad4aec0 100644 --- a/Xext/geext.c +++ b/Xext/geext.c @@ -32,10 +32,7 @@ #include "geint.h" #include "geext.h" - -/* Currently supported XGE version */ -#define SERVER_GE_MAJOR 1 -#define SERVER_GE_MINOR 0 +#include "protocol-versions.h" #define rClient(obj) (clients[CLIENT_ID((obj)->resource)]) @@ -81,8 +78,8 @@ ProcGEQueryVersion(ClientPtr client) rep.sequenceNumber = client->sequence; /* return the supported version by the server */ - rep.majorVersion = SERVER_GE_MAJOR; - rep.minorVersion = SERVER_GE_MINOR; + rep.majorVersion = SERVER_GE_MAJOR_VERSION; + rep.minorVersion = SERVER_GE_MINOR_VERSION; /* Remember version the client requested */ pGEClient->major_version = stuff->majorVersion; |