summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2011-12-24 12:18:16 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2011-12-24 12:18:16 +1000
commit0ba58f483e564bd815bae36f6272029693c1fd5c (patch)
treea89e7c1c125397ce6693f9acc4118a9e0883266c
parent5fb48757477b2effd69c8fe8722ad95b21dbf7f5 (diff)
Always include mt_mask in the evdev struct
Even if MT support isn't available, include it in the build. The checks in the code check whether mt_mask is non-NULL but they would all need ifdef escaping otherwise. Leave the mtdev part inside the ifdef however, so that we don't need the mtdev header if we don't build with multitouch. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/evdev.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/evdev.h b/src/evdev.h
index 5fd99ff..7d49919 100644
--- a/src/evdev.h
+++ b/src/evdev.h
@@ -153,10 +153,10 @@ typedef struct {
ValuatorMask *vals; /* new values coming in */
ValuatorMask *old_vals; /* old values for calculating relative motion */
ValuatorMask *prox; /* last values set while not in proximity */
-#ifdef MULTITOUCH
ValuatorMask *mt_mask;
int cur_slot;
enum SlotState slot_state;
+#ifdef MULTITOUCH
struct mtdev *mtdev;
#endif