aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2012-07-10 00:34:56 +0100
committerPeter Hutterer <peter.hutterer@who-t.net>2012-07-30 15:17:10 +1000
commit09987eab9a77aa94127ecacca41498bc5e83c0eb (patch)
tree54b24c78223d8acd097e8cd361e721babffb2d37
parentstrtol doesn't need a empty string, NULL is good enough. (diff)
downloadxf86-input-evdev-09987eab9a77aa94127ecacca41498bc5e83c0eb.tar.gz
xf86-input-evdev-09987eab9a77aa94127ecacca41498bc5e83c0eb.tar.bz2
xf86-input-evdev-09987eab9a77aa94127ecacca41498bc5e83c0eb.zip
Fix compilation warnings for non-multitouch builds
Signed-off-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit f5ede98085688b59dc56a9cc6592f75552a4e7ed)
-rw-r--r--src/evdev.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/evdev.c b/src/evdev.c
index a12e97b..b32d617 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1062,7 +1062,9 @@ EvdevProcessEvent(InputInfoPtr pInfo, struct input_event *ev)
static void
EvdevFreeMasks(EvdevPtr pEvdev)
{
+#ifdef MULTITOUCH
int i;
+#endif
valuator_mask_free(&pEvdev->vals);
valuator_mask_free(&pEvdev->old_vals);
@@ -1345,7 +1347,9 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device)
i = 0;
for (axis = ABS_X; i < MAX_VALUATORS && axis <= ABS_MAX; axis++) {
+#ifdef MULTITOUCH
int j;
+#endif
int mapping;
pEvdev->axis_map[axis] = -1;
if (!EvdevBitIsSet(pEvdev->abs_bitmask, axis) ||