|
 |
1b49165 |
diff -up xorg-server-1.3.0.0/composite/compext.c.jx xorg-server-1.3.0.0/composite/compext.c
|
|
|
1b49165 |
--- xorg-server-1.3.0.0/composite/compext.c.jx 2007-07-12 09:30:39.000000000 -0400
|
|
|
1b49165 |
+++ xorg-server-1.3.0.0/composite/compext.c 2007-07-12 09:33:45.000000000 -0400
|
|
|
1b49165 |
@@ -49,6 +49,9 @@
|
|
|
1b49165 |
|
|
|
1b49165 |
#include "compint.h"
|
|
|
1b49165 |
|
|
|
1b49165 |
+#define SERVER_COMPOSITE_MAJOR 0
|
|
|
1b49165 |
+#define SERVER_COMPOSITE_MINOR 3
|
|
|
1b49165 |
+
|
|
|
1b49165 |
static CARD8 CompositeReqCode;
|
|
|
1b49165 |
int CompositeClientPrivateIndex;
|
|
|
1b49165 |
RESTYPE CompositeClientWindowType;
|
|
|
1b49165 |
@@ -133,16 +136,16 @@ ProcCompositeQueryVersion (ClientPtr cli
|
|
|
1b49165 |
rep.type = X_Reply;
|
|
|
1b49165 |
rep.length = 0;
|
|
|
1b49165 |
rep.sequenceNumber = client->sequence;
|
|
|
1b49165 |
- if (stuff->majorVersion < COMPOSITE_MAJOR) {
|
|
|
1b49165 |
+ if (stuff->majorVersion < SERVER_COMPOSITE_MAJOR) {
|
|
|
1b49165 |
rep.majorVersion = stuff->majorVersion;
|
|
|
1b49165 |
rep.minorVersion = stuff->minorVersion;
|
|
|
1b49165 |
} else {
|
|
|
1b49165 |
- rep.majorVersion = COMPOSITE_MAJOR;
|
|
|
1b49165 |
- if (stuff->majorVersion == COMPOSITE_MAJOR &&
|
|
|
1b49165 |
- stuff->minorVersion < COMPOSITE_MINOR)
|
|
|
1b49165 |
+ rep.majorVersion = SERVER_COMPOSITE_MAJOR;
|
|
|
1b49165 |
+ if (stuff->majorVersion == SERVER_COMPOSITE_MAJOR &&
|
|
|
1b49165 |
+ stuff->minorVersion < SERVER_COMPOSITE_MINOR)
|
|
|
1b49165 |
rep.minorVersion = stuff->minorVersion;
|
|
|
1b49165 |
else
|
|
|
1b49165 |
- rep.minorVersion = COMPOSITE_MINOR;
|
|
|
1b49165 |
+ rep.minorVersion = SERVER_COMPOSITE_MINOR;
|
|
|
1b49165 |
}
|
|
|
1b49165 |
pCompositeClient->major_version = rep.majorVersion;
|
|
|
1b49165 |
pCompositeClient->minor_version = rep.minorVersion;
|