aboutsummaryrefslogtreecommitdiff
path: root/src
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-13 16:23:58 +1000
commitf5ede98085688b59dc56a9cc6592f75552a4e7ed (patch)
treedc2583cbeab163fa978a0e6b0084d439b82bafd8 /src
parentMove axis labels into a separate header file (diff)
downloadxf86-input-evdev-f5ede98085688b59dc56a9cc6592f75552a4e7ed.tar.gz
xf86-input-evdev-f5ede98085688b59dc56a9cc6592f75552a4e7ed.tar.bz2
xf86-input-evdev-f5ede98085688b59dc56a9cc6592f75552a4e7ed.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>
Diffstat (limited to 'src')
-rw-r--r--src/evdev.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/evdev.c b/src/evdev.c
index c273326..232e406 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1065,7 +1065,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);
@@ -1348,7 +1350,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) ||