diff options
Diffstat (limited to 'composite/compext.c')
| -rw-r--r-- | composite/compext.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/composite/compext.c b/composite/compext.c index bea8bcf23..944f8d844 100644 --- a/composite/compext.c +++ b/composite/compext.c @@ -1,7 +1,4 @@ /* - * $Id$ - * - * * Copyright © 2006 Sun Microsystems * * Permission to use, copy, modify, distribute, and sell this software and its @@ -49,6 +46,9 @@ #include "compint.h" +#define SERVER_COMPOSITE_MAJOR 0 +#define SERVER_COMPOSITE_MINOR 4 + static CARD8 CompositeReqCode; static int CompositeClientPrivateIndex; RESTYPE CompositeClientWindowType; @@ -133,16 +133,12 @@ ProcCompositeQueryVersion (ClientPtr client) rep.type = X_Reply; rep.length = 0; rep.sequenceNumber = client->sequence; - if (stuff->majorVersion < COMPOSITE_MAJOR) { + if (stuff->majorVersion < SERVER_COMPOSITE_MAJOR) { rep.majorVersion = stuff->majorVersion; rep.minorVersion = stuff->minorVersion; } else { - rep.majorVersion = COMPOSITE_MAJOR; - if (stuff->majorVersion == COMPOSITE_MAJOR && - stuff->minorVersion < COMPOSITE_MINOR) - rep.minorVersion = stuff->minorVersion; - else - rep.minorVersion = COMPOSITE_MINOR; + rep.majorVersion = SERVER_COMPOSITE_MAJOR; + rep.minorVersion = SERVER_COMPOSITE_MINOR; } pCompositeClient->major_version = rep.majorVersion; pCompositeClient->minor_version = rep.minorVersion; |