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/shape.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/shape.c')
| -rw-r--r-- | Xext/shape.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Xext/shape.c b/Xext/shape.c index 53167d140..700fe76d1 100644 --- a/Xext/shape.c +++ b/Xext/shape.c @@ -45,6 +45,7 @@ in this Software without prior written authorization from The Open Group. #include "regionstr.h" #include "gcstruct.h" #include "modinit.h" +#include "protocol-versions.h" typedef RegionPtr (*CreateDftPtr)( WindowPtr /* pWin */ @@ -259,8 +260,8 @@ ProcShapeQueryVersion (ClientPtr client) rep.type = X_Reply; rep.length = 0; rep.sequenceNumber = client->sequence; - rep.majorVersion = SHAPE_MAJOR_VERSION; - rep.minorVersion = SHAPE_MINOR_VERSION; + rep.majorVersion = SERVER_SHAPE_MAJOR_VERSION; + rep.minorVersion = SERVER_SHAPE_MINOR_VERSION; if (client->swapped) { swaps(&rep.sequenceNumber, n); swapl(&rep.length, n); |