summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2009-02-17 09:59:17 -0800
committerKeith Packard <keithp@keithp.com>2009-07-06 13:23:29 -0700
commitd478bc948838d11b3abcf6d2cdd3a00dccb344c4 (patch)
tree950b971be3d5f054f26e8acef0a9eadd4896ecda
parenta7a93c12f91e0de72868f17a555215f1795d9e2f (diff)
xinerama: Put the proto version in the code instead using proto headers.
Proto headers updating resulting in the server advertising new versions is broken. This should be applied to every extension. This fixes the build against slightly-older xineramaproto. (cherry picked from commit b349a764e98f0d8f221190157ffa0904b91beca5) Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--Xext/panoramiX.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index bab8c9839..a1f4ce01e 100644
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@@ -58,6 +58,8 @@ Equipment Corporation.
#endif
#include "modinit.h"
+#define SERVER_PANORAMIX_MAJOR_VERSION 1
+#define SERVER_PANORAMIX_MINOR_VERSION 1
#ifdef GLXPROXY
extern VisualPtr glxMatchVisual(ScreenPtr pScreen,
@@ -903,8 +905,8 @@ ProcPanoramiXQueryVersion (ClientPtr client)
rep.type = X_Reply;
rep.length = 0;
rep.sequenceNumber = client->sequence;
- rep.majorVersion = PANORAMIX_MAJOR_VERSION;
- rep.minorVersion = PANORAMIX_MINOR_VERSION;
+ rep.majorVersion = SERVER_PANORAMIX_MAJOR_VERSION;
+ rep.minorVersion = SERVER_PANORAMIX_MINOR_VERSION;
if (client->swapped) {
swaps(&rep.sequenceNumber, n);
swapl(&rep.length, n);