xserver: Branch 'master'

[Peter Hutterer]

 hw/xwayland/xwayland-input.c |    6 ------
 1 file changed, 6 deletions(-)

New commits:
commit 45af7fcb522464922831005d63cc362dc09f19a9
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Thu Nov 10 09:36:40 2016 +0100

    xwayland: Remove MIPOINTER() definition
    
    Not needed anymore now that mipointer exposes an API for that,
    miPointerInvalidateSprite()
    
    Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/hw/xwayland/xwayland-input.c b/hw/xwayland/xwayland-input.c
index 7ec3b1a..0526122 100644
--- a/hw/xwayland/xwayland-input.c
+++ b/hw/xwayland/xwayland-input.c
@@ -35,12 +35,6 @@
 #include <mipointer.h>
 #include <mipointrst.h>
 
-/* Copied from mipointer.c */
-#define MIPOINTER(dev) \
-    (IsFloating(dev) ? \
-        (miPointerPtr)dixLookupPrivate(&(dev)->devPrivates, miPointerPrivKey): \
-        (miPointerPtr)dixLookupPrivate(&(GetMaster(dev, MASTER_POINTER))->devPrivates, miPointerPrivKey))
-
 struct sync_pending {
     struct xorg_list l;
     DeviceIntPtr pending_dev;