diff options
Diffstat (limited to 'driver/xf86-input-dynapro/src/xf86Dyna.c')
| -rw-r--r-- | driver/xf86-input-dynapro/src/xf86Dyna.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/driver/xf86-input-dynapro/src/xf86Dyna.c b/driver/xf86-input-dynapro/src/xf86Dyna.c index 3436d2dc5..0a899f007 100644 --- a/driver/xf86-input-dynapro/src/xf86Dyna.c +++ b/driver/xf86-input-dynapro/src/xf86Dyna.c @@ -66,7 +66,7 @@ static XF86ModuleVersionInfo VersionRec = MODINFOSTRING1, MODINFOSTRING2, XORG_VERSION_CURRENT, - 1, 0, 0, + PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, MOD_CLASS_XINPUT, @@ -114,7 +114,9 @@ static const char *reqSymbols[] = { "xf86SetIntOption", "xf86SetStrOption", "xf86XInputSetScreen", +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 "xf86XInputSetSendCoreEvents", +#endif NULL }; @@ -459,7 +461,7 @@ ReadInput (InputInfoPtr pInfo) static int ControlProc (InputInfoPtr pInfo, xDeviceCtl * control) { - xDeviceTSCalibrationCtl *c = (xDeviceTSCalibrationCtl *) control; + xDeviceAbsCalibCtl *c = (xDeviceAbsCalibCtl *) control; DynaproPrivatePtr priv = (DynaproPrivatePtr) (pInfo->private); priv->min_x = c->min_x; @@ -494,11 +496,13 @@ SwitchMode (ClientPtr client, DeviceIntPtr dev, int mode) priv->reporting_mode = mode; return (Success); } +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 else if ((mode == SendCoreEvents) || (mode == DontSendCoreEvents)) { xf86XInputSetSendCoreEvents (pInfo, (mode == SendCoreEvents)); return (Success); } +#endif else return (!Success); } |