From 0ba58f483e564bd815bae36f6272029693c1fd5c Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Sat, 24 Dec 2011 12:18:16 +1000 Subject: 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 --- src/evdev.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/evdev.h') 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 -- cgit v1.2.3