[PATCH evdev] Add missing mt axis labels

[Peter Hutterer]

On Fri, Oct 26, 2012 at 04:27:35PM +0200, Benjamin Tissoires wrote:
> update evdev according to latest changes in input.h
> 
> Signed-off-by: Benjamin Tissoires <benjamin.tissoires at gmail.com>
> ---
> 
> Hi Peter,
> 
> well, I doubt we should bump the ABI number for just 3 labels in xserver.
> So I'm not sure about the #ifdef here. Don't hesitate to send any comments.

This is fine as-is, thanks. Both patches mergedo

Cheers,
   Peter

>  src/axis_labels.h | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/src/axis_labels.h b/src/axis_labels.h
> index 1c19a0b..f01474e 100644
> --- a/src/axis_labels.h
> +++ b/src/axis_labels.h
> @@ -94,6 +94,11 @@ static const char* abs_labels[] = {
>      AXIS_LABEL_PROP_ABS_MT_BLOB_ID,     /* 0x38 */
>      AXIS_LABEL_PROP_ABS_MT_TRACKING_ID, /* 0x39 */
>      AXIS_LABEL_PROP_ABS_MT_PRESSURE,    /* 0x3a */
> +#ifdef AXIS_LABEL_PROP_ABS_MT_DISTANCE
> +    AXIS_LABEL_PROP_ABS_MT_DISTANCE,    /* 0x3b */
> +    AXIS_LABEL_PROP_ABS_MT_TOOL_X,      /* 0x3c */
> +    AXIS_LABEL_PROP_ABS_MT_TOOL_Y,      /* 0x3d */
> +#endif /* AXIS_LABEL_PROP_ABS_MT_DISTANCE */
>  };
>  
>  static const char* rel_labels[] = {
> -- 
> 1.7.11.7
>