[PATCH synaptics] Fix build error if HAVE_MTDEV is false

Chase Douglas chase.douglas at canonical.com
Thu Feb 16 23:27:40 PST 2012


On Feb 17, 2012, at 2:47 AM, Peter Hutterer <peter.hutterer at who-t.net> wrote:

> priv->has_touch is conditional on HAVE_MTDEV
> 
> Introduced in f9a906590e59383aef3c53faca98f0de40859f17
> 
> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
> ---
> src/eventcomm.c |    2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/src/eventcomm.c b/src/eventcomm.c
> index e97faa8..6147e41 100644
> --- a/src/eventcomm.c
> +++ b/src/eventcomm.c
> @@ -410,6 +410,7 @@ event_query_axis_ranges(InputInfoPtr pInfo)
>              &priv->minw, &priv->maxw,
>              NULL, NULL);
> 
> +#if HAVE_MTDEV
>     if (priv->has_touch)
>     {
>         int st_minx = priv->minx;
> @@ -429,6 +430,7 @@ event_query_axis_ranges(InputInfoPtr pInfo)
>         proto_data->st_to_mt_scale_y =
>             (priv->maxy - priv->miny) / (st_maxy - st_miny);
>     }
> +#endif
> 
>     SYSCALL(rc = ioctl(pInfo->fd, EVIOCGBIT(EV_KEY, sizeof(keybits)), keybits));
>     if (rc >= 0)
> -- 
> 1.7.7.5
> 

Oops, not sure how I missed that.

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


More information about the xorg-devel mailing list