diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-02-18 12:28:43 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-02-22 14:35:45 +1000 |
| commit | 17265ccb027e3f956bf7409106174f44621d1cb8 (patch) | |
| tree | c7094a1c7e4b158a0777075fca00cc8724d875a1 /dix/events.c | |
| parent | 77113dd3eef03dd65b556b672d976817b3f4542e (diff) | |
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 <peter.hutterer@who-t.net>
Reviewed-by: Benjamin Tissoires <tissoire@cena.fr>
Diffstat (limited to 'dix/events.c')
| -rw-r--r-- | dix/events.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 |