Hi Peter. Peter Hutterer <[email protected]> (03/12/2010): > Signed-off-by: Peter Hutterer <[email protected]> > --- > src/xf86MuTouch.c | 90 +++++++++++++++++++--------------------------------- > 1 files changed, 33 insertions(+), 57 deletions(-) > > diff --git a/src/xf86MuTouch.c b/src/xf86MuTouch.c > index 4312256..97d8843 100644 > --- a/src/xf86MuTouch.c > +++ b/src/xf86MuTouch.c > @@ -727,12 +727,14 @@ xf86MuTControl(DeviceIntPtr dev, > priv->min_x, priv->max_x, > 9500, > 0 /* min_res */, > - 9500 /* max_res */); > + 9500 /* max_res */, > + Absolute); > InitValuatorAxisStruct(dev, 1, axis_labels[1], > priv->min_y, priv->max_y, > 10500, > 0 /* min_res */, > - 10500 /* max_res */); > + 10500 /* max_res */, > + Absolute); > }
Err, this breaks building against server-1.9?
| xf86MuTouch.c: In function ‘xf86MuTControl’:
| xf86MuTouch.c:733: error: too many arguments to function
‘InitValuatorAxisStruct’
| xf86MuTouch.c:739: error: too many arguments to function
‘InitValuatorAxisStruct’
> @@ -1261,7 +1236,7 @@ xf86MuTInit(InputDriverPtr drv,
> […]
>
> _X_EXPORT InputDriverRec MUTOUCH = {
> @@ -1271,6 +1246,7 @@ _X_EXPORT InputDriverRec MUTOUCH = {
> xf86MuTInit, /* pre-init */
> xf86MuTUninit, /* un-init */
> NULL, /* module */
> + default_options
> };
This breaks as well:
| xf86MuTouch.c: At top level:
| xf86MuTouch.c:1248: warning: initialization from incompatible pointer type
| xf86MuTouch.c:1252: warning: initialization makes integer from pointer
without a cast
| xf86MuTouch.c:1252: error: initializer element is not computable at load time
| xf86MuTouch.c:1252: error: (near initialization for ‘MUTOUCH.refCount’)
(While I'm at it, you may want an extra comma at the end of the
'+ default_options' line to reduce diff noise if there's any later
addition.)
Mraw,
KiBi.
signature.asc
Description: Digital signature
_______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
