From 67b353c9ce039b254ba2e92cd6f842c505a8bd21 Mon Sep 17 00:00:00 2001 From: marha Date: Thu, 24 Sep 2009 10:49:08 +0000 Subject: Update following packages: - xproto-7.0.16 - libXdmcp-1.0.3 - bdftopcf-1.0.2 - xorg-server-1.6.99.902 --- xorg-server/composite/compext.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'xorg-server/composite') diff --git a/xorg-server/composite/compext.c b/xorg-server/composite/compext.c index 56b4f2784..976d00242 100644 --- a/xorg-server/composite/compext.c +++ b/xorg-server/composite/compext.c @@ -53,9 +53,7 @@ #include "compint.h" #include "xace.h" - -#define SERVER_COMPOSITE_MAJOR 0 -#define SERVER_COMPOSITE_MINOR 4 +#include "protocol-versions.h" static CARD8 CompositeReqCode; static int CompositeClientPrivateKeyIndex; @@ -124,12 +122,12 @@ ProcCompositeQueryVersion (ClientPtr client) rep.type = X_Reply; rep.length = 0; rep.sequenceNumber = client->sequence; - if (stuff->majorVersion < SERVER_COMPOSITE_MAJOR) { + if (stuff->majorVersion < SERVER_COMPOSITE_MAJOR_VERSION) { rep.majorVersion = stuff->majorVersion; rep.minorVersion = stuff->minorVersion; } else { - rep.majorVersion = SERVER_COMPOSITE_MAJOR; - rep.minorVersion = SERVER_COMPOSITE_MINOR; + rep.majorVersion = SERVER_COMPOSITE_MAJOR_VERSION; + rep.minorVersion = SERVER_COMPOSITE_MINOR_VERSION; } pCompositeClient->major_version = rep.majorVersion; pCompositeClient->minor_version = rep.minorVersion; -- cgit v1.2.3