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 /glx | |
| 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 'glx')
| -rw-r--r-- | glx/glxcmds.c | 5 | ||||
| -rw-r--r-- | glx/glxserver.h | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/glx/glxcmds.c b/glx/glxcmds.c index f5632d162..b1061a8c2 100644 --- a/glx/glxcmds.c +++ b/glx/glxcmds.c @@ -50,6 +50,7 @@ #include "indirect_dispatch.h" #include "indirect_table.h" #include "indirect_util.h" +#include "protocol-versions.h" static int validGlxScreen(ClientPtr client, int screen, __GLXscreen **pGlxScreen, int *err) @@ -738,8 +739,8 @@ int __glXDisp_QueryVersion(__GLXclientState *cl, GLbyte *pc) ** client if it wants to work with older clients; however, in this ** implementation the server just returns its version number. */ - reply.majorVersion = GLX_SERVER_MAJOR_VERSION; - reply.minorVersion = GLX_SERVER_MINOR_VERSION; + reply.majorVersion = SERVER_GLX_MAJOR_VERSION; + reply.minorVersion = SERVER_GLX_MINOR_VERSION; reply.length = 0; reply.type = X_Reply; reply.sequenceNumber = client->sequence; diff --git a/glx/glxserver.h b/glx/glxserver.h index 46c938268..4aa8c2eec 100644 --- a/glx/glxserver.h +++ b/glx/glxserver.h @@ -64,10 +64,6 @@ typedef struct __GLXcontext __GLXcontext; #include "glxdrawable.h" #include "glxcontext.h" - -#define GLX_SERVER_MAJOR_VERSION 1 -#define GLX_SERVER_MINOR_VERSION 2 - #ifndef True #define True 1 #endif |