xserver: Branch 'master'

[Adam Jackson]

 Xext/sync.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8060196a3e80a3c0ad2c0abbe459416821cd366c
Author: Louis-Francis Ratté-Boulianne <lfrb at collabora.com>
Date:   Wed Sep 27 01:24:28 2017 -0400

    sync: Fix delta value check
    
    While transitionning from CARD64 to int64, the GreaterThan call
    as mistakenly been transformed into ">=". That was at least
    causing problems with Mutter.
    
    Signed-off-by: Louis-Francis Ratté-Boulianne <lfrb at collabora.com>
    Reviewed-by: Adam Jackson <ajax at redhat.com>

diff --git a/Xext/sync.c b/Xext/sync.c
index 822c205a7..37d41f224 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -865,7 +865,7 @@ SyncChangeAlarmAttributes(ClientPtr client, SyncAlarm * pAlarm, Mask mask,
             ||
             (((pAlarm->trigger.test_type == XSyncNegativeComparison) ||
               (pAlarm->trigger.test_type == XSyncNegativeTransition))
-             && pAlarm->delta >= 0)
+             && pAlarm->delta > 0)
             ) {
             return BadMatch;
         }