From ffd4874798ba54f86acac75779a15b4babeaa5f3 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 11 May 2011 12:20:50 +1000 Subject: include: add version_compare helper function Compare two version numbers in the major.minor form. Switch the few users of manual version switching over to the new function. Signed-off-by: Peter Hutterer Reviewed-by: Jamey Sharp --- randr/rrdispatch.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'randr') diff --git a/randr/rrdispatch.c b/randr/rrdispatch.c index 213550475..d1c99c288 100644 --- a/randr/rrdispatch.c +++ b/randr/rrdispatch.c @@ -28,8 +28,8 @@ RRClientKnowsRates (ClientPtr pClient) { rrClientPriv(pClient); - return (pRRClient->major_version > 1 || - (pRRClient->major_version == 1 && pRRClient->minor_version >= 1)); + return version_compare(pRRClient->major_version, pRRClient->minor_version, + 1, 1) >= 0; } static int @@ -47,8 +47,8 @@ ProcRRQueryVersion (ClientPtr client) rep.length = 0; rep.sequenceNumber = client->sequence; - if ((stuff->majorVersion * 1000 + stuff->minorVersion) < - (SERVER_RANDR_MAJOR_VERSION * 1000 + SERVER_RANDR_MINOR_VERSION)) + if (version_compare(stuff->majorVersion, stuff->minorVersion, + SERVER_RANDR_MAJOR_VERSION, SERVER_RANDR_MINOR_VERSION) < 0) { rep.majorVersion = stuff->majorVersion; rep.minorVersion = stuff->minorVersion; -- cgit v1.2.3