xserver: Branch 'master' - 2 commits

[Keith Packard]

 hw/xfree86/common/xf86Module.h |    6 +++---
 test/touch.c                   |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit c07b796b47ae7f5a616d5e8e02ab0f84dc438a93
Author: Keith Packard <keithp at keithp.com>
Date:   Sun May 29 18:38:18 2016 -0700

    xfree86: Bump ABI versions
    
    threaded input can affect drivers that use OsBlockSIGIO when dealing
    with cursors.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>
    Requested-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index fc61120..14c7700 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -79,9 +79,9 @@ typedef enum {
  * mask is 0xFFFF0000.
  */
 #define ABI_ANSIC_VERSION	SET_ABI_VERSION(0, 4)
-#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(21, 0)
-#define ABI_XINPUT_VERSION	SET_ABI_VERSION(22, 1)
-#define ABI_EXTENSION_VERSION	SET_ABI_VERSION(9, 0)
+#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(22, 0)
+#define ABI_XINPUT_VERSION	SET_ABI_VERSION(23, 1)
+#define ABI_EXTENSION_VERSION	SET_ABI_VERSION(10, 0)
 
 #define MODINFOSTRING1	0xef23fdc5
 #define MODINFOSTRING2	0x10dc023a
commit 24e4c6db25aef7a057f3f384f1e2ce67e66fa40e
Author: Keith Packard <keithp at keithp.com>
Date:   Sun May 29 18:43:00 2016 -0700

    test: Actually verify that two equivalent touch points are the same
    
    I typo'd when fixing this at Peter's request and left off the '2' from
    the second variable name.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/test/touch.c b/test/touch.c
index 1364d61..19c6878 100644
--- a/test/touch.c
+++ b/test/touch.c
@@ -143,7 +143,7 @@ touch_find_ddxid(void)
     ti = TouchFindByDDXID(&dev, 30, TRUE);
     assert(ti != NULL);
     ti2 = TouchFindByDDXID(&dev, 30, TRUE);
-    assert(ti == ti);
+    assert(ti == ti2);
     /* make sure we have resized */
     assert(dev.last.num_touches == 8); /* EQ grows from 5 to 8 */