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 /include/inputstr.h | |
| 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 'include/inputstr.h')
| -rw-r--r-- | include/inputstr.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/inputstr.h b/include/inputstr.h index 58d318fd6..4c67e3dea 100644 --- a/include/inputstr.h +++ b/include/inputstr.h @@ -530,10 +530,8 @@ typedef struct _DeviceIntRec { PrivateRec *devPrivates; DeviceUnwrapProc unwrapProc; SpriteInfoPtr spriteInfo; - union { - DeviceIntPtr master; /* master device */ - DeviceIntPtr lastSlave; /* last slave device used */ - } u; + DeviceIntPtr master; /* master device */ + DeviceIntPtr lastSlave; /* last slave device used */ /* last valuator values recorded, not posted to client; * for slave devices, valuators is in device coordinates |