[PATCH evdev] Fix compilation warnings for non-multitouch builds

Chase Douglas chase.douglas at canonical.com
Mon Jul 9 16:51:04 PDT 2012


On 07/09/2012 04:34 PM, Daniel Stone wrote:
> Signed-off-by: Daniel Stone <daniel at fooishbar.org>
> ---
>   src/evdev.c |    4 ++++
>   1 file changed, 4 insertions(+)
>
> 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) ||
>

Looks fine to me.

Reviewed-by: Chase Douglas <chase.douglas at canonical.com>


More information about the xorg-devel mailing list