From 17265ccb027e3f956bf7409106174f44621d1cb8 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 18 Feb 2011 12:28:43 +1000 Subject: Move master/lastSlave out of the union into separate fields. The removal of the double-use will cause some suble bugs as some conditions to check for the dev->u.master case were broken and also evaluated as true if lastSlave was set (instead of master). Also breaks the input ABI. Signed-off-by: Peter Hutterer Reviewed-by: Benjamin Tissoires --- dix/events.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'dix/events.c') diff --git a/dix/events.c b/dix/events.c index 8b3bfb791..f39d8a90b 100644 --- a/dix/events.c +++ b/dix/events.c @@ -3244,8 +3244,8 @@ ProcWarpPointer(ClientPtr client) } } - if (dev->u.lastSlave) - dev = dev->u.lastSlave; + if (dev->lastSlave) + dev = dev->lastSlave; pSprite = dev->spriteInfo->sprite; #ifdef PANORAMIX -- cgit v1.2.3