summaryrefslogtreecommitdiff
path: root/mi
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2011-02-18 12:28:43 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2011-02-22 14:35:45 +1000
commit17265ccb027e3f956bf7409106174f44621d1cb8 (patch)
treec7094a1c7e4b158a0777075fca00cc8724d875a1 /mi
parent77113dd3eef03dd65b556b672d976817b3f4542e (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 'mi')
-rw-r--r--mi/mieq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mi/mieq.c b/mi/mieq.c
index a3e60855d..08a0c8758 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -402,7 +402,7 @@ mieqProcessDeviceEvent(DeviceIntPtr dev,
master = CopyGetMasterEvent(dev, event, &mevent);
if (master)
- master->u.lastSlave = dev;
+ master->lastSlave = dev;
/* If someone's registered a custom event handler, let them
* steal it. */