diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-12-24 12:18:16 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-12-24 12:18:16 +1000 |
| commit | 0ba58f483e564bd815bae36f6272029693c1fd5c (patch) | |
| tree | a89e7c1c125397ce6693f9acc4118a9e0883266c /src/evdev.h | |
| parent | Merge branch 'multitouch' (diff) | |
| download | xf86-input-evdev-0ba58f483e564bd815bae36f6272029693c1fd5c.tar.gz xf86-input-evdev-0ba58f483e564bd815bae36f6272029693c1fd5c.tar.bz2 xf86-input-evdev-0ba58f483e564bd815bae36f6272029693c1fd5c.zip | |
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>
Diffstat (limited to 'src/evdev.h')
| -rw-r--r-- | src/evdev.h | 2 |
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 |