diff options
| author | marha <marha@users.sourceforge.net> | 2011-05-16 09:49:27 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-05-16 09:49:27 +0000 |
| commit | ab5c2d2c78273ccdc7c9734bcba482a33fcf9652 (patch) | |
| tree | d12aaeba9956621fe7429d94a7c90105fe306b42 /xorg-server/xfixes/xfixes.c | |
| parent | 421ecdd3ee6f691c63c4568944423d986f9f69db (diff) | |
| parent | 08cbf3b50bfe713044f36b363c73768cd042f13c (diff) | |
| download | vcxsrv-ab5c2d2c78273ccdc7c9734bcba482a33fcf9652.tar.gz vcxsrv-ab5c2d2c78273ccdc7c9734bcba482a33fcf9652.tar.bz2 vcxsrv-ab5c2d2c78273ccdc7c9734bcba482a33fcf9652.zip | |
merge ^/branches/released .
Diffstat (limited to 'xorg-server/xfixes/xfixes.c')
| -rw-r--r-- | xorg-server/xfixes/xfixes.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xorg-server/xfixes/xfixes.c b/xorg-server/xfixes/xfixes.c index 80f212273..e164aa9d1 100644 --- a/xorg-server/xfixes/xfixes.c +++ b/xorg-server/xfixes/xfixes.c @@ -72,17 +72,17 @@ ProcXFixesQueryVersion(ClientPtr client) rep.type = X_Reply;
rep.length = 0;
rep.sequenceNumber = client->sequence;
- if (stuff->majorVersion < SERVER_XFIXES_MAJOR_VERSION) {
+
+ if (version_compare(stuff->majorVersion, stuff->minorVersion,
+ SERVER_XFIXES_MAJOR_VERSION, SERVER_XFIXES_MAJOR_VERSION) < 0)
+ {
rep.majorVersion = stuff->majorVersion;
rep.minorVersion = stuff->minorVersion;
} else {
rep.majorVersion = SERVER_XFIXES_MAJOR_VERSION;
- if (stuff->majorVersion == SERVER_XFIXES_MAJOR_VERSION &&
- stuff->minorVersion < SERVER_XFIXES_MINOR_VERSION)
- rep.minorVersion = stuff->minorVersion;
- else
- rep.minorVersion = SERVER_XFIXES_MINOR_VERSION;
+ rep.minorVersion = SERVER_XFIXES_MINOR_VERSION;
}
+
pXFixesClient->major_version = rep.majorVersion;
pXFixesClient->minor_version = rep.minorVersion;
if (client->swapped) {
|