From 854df75f4908bee66e1057f6f04817a1c47124bc Mon Sep 17 00:00:00 2001 From: Pete Beardmore Date: Mon, 9 Jan 2012 23:47:45 +0000 Subject: missing multitouch related define tests addition of two missing define tests required when no multitouch related symbols are available in user-space Fixes X.Org Bug 44578 Signed-off-by: Pete Beardmore Signed-off-by: Peter Hutterer --- src/evdev.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/evdev.c b/src/evdev.c index 82cdb00..989a255 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -1143,6 +1143,7 @@ EvdevAddKeyClass(DeviceIntPtr device) return Success; } +#ifdef MULTITOUCH /* MT axes are counted twice - once as ABS_X (which the kernel keeps for * backwards compatibility), once as ABS_MT_POSITION_X. So we need to keep a * mapping of those axes to make sure we only count them once @@ -1160,6 +1161,7 @@ static struct mt_axis_mappings mt_axis_mappings[] = { {ABS_MT_PRESSURE, ABS_PRESSURE}, {ABS_MT_DISTANCE, ABS_DISTANCE}, }; +#endif /** * return TRUE if the axis is not one we should count as true axis @@ -1280,6 +1282,7 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device) mapping = i; +#ifdef MULTITOUCH for (j = 0; j < ArrayLength(mt_axis_mappings); j++) { if (mt_axis_mappings[j].code == axis) @@ -1288,7 +1291,7 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device) mt_axis_mappings[j].needs_mapping) mapping = mt_axis_mappings[j].mapping; } - +#endif pEvdev->axis_map[axis] = mapping; if (mapping == i) i++; -- cgit v1.2.3