diff options
| author | Cyril Brulebois <kibi@debian.org> | 2011-06-03 15:59:15 +0200 |
|---|---|---|
| committer | Cyril Brulebois <kibi@debian.org> | 2011-06-03 15:59:15 +0200 |
| commit | 21f7f1705d2c0b46ce19367d5ac8a4c225d755ef (patch) | |
| tree | 1db1977a8611eb1da8f0700f3946c68e64c8613a | |
| parent | ef1e9cf34e8f1ec2513dd6bd36d824b54e841ea7 (diff) | |
Remove checks on the ABI now that 12 or higher is required.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
| -rw-r--r-- | src/acecad.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/src/acecad.c b/src/acecad.c index 17e141f..de2577e 100644 --- a/src/acecad.c +++ b/src/acecad.c @@ -79,10 +79,8 @@ #endif #endif -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 #include <X11/Xatom.h> #include <xserver-properties.h> -#endif /* Previously found in xf86Xinput.h */ #ifdef DBG @@ -130,9 +128,7 @@ _X_EXPORT InputDriverRec ACECAD = AceCadPreInit, NULL, NULL, -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12 default_options -#endif }; static XF86ModuleVersionInfo VersionRec = @@ -599,7 +595,6 @@ DeviceInit (DeviceIntPtr dev) AceCadPrivatePtr priv = (AceCadPrivatePtr) (local->private); unsigned char map[] = {0, 1, 2, 3}; int history_size; -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 Atom btn_labels[3]; Atom axes_labels[3]; @@ -618,15 +613,12 @@ DeviceInit (DeviceIntPtr dev) axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y); axes_labels[2] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Z); } -#endif xf86MsgVerb(X_INFO, 4, "%s Init\n", local->name); /* 3 boutons */ if (InitButtonClassDeviceStruct (dev, 3, -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 btn_labels, -#endif map) == FALSE) { xf86Msg(X_ERROR, "%s: unable to allocate ButtonClassDeviceStruct\n", local->name); @@ -648,9 +640,7 @@ DeviceInit (DeviceIntPtr dev) /* 3 axes */ if (InitValuatorClassDeviceStruct (dev, 3, -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 axes_labels, -#endif history_size, ((priv->flags & ABSOLUTE_FLAG)? Absolute: Relative)|OutOfProximity) == FALSE) @@ -663,9 +653,7 @@ DeviceInit (DeviceIntPtr dev) InitValuatorAxisStruct(dev, 0, -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 axes_labels[0], -#endif 0, /* min val */ #if XORG_BOTCHED_INPUT screenInfo.screens[0]->width, @@ -675,15 +663,11 @@ DeviceInit (DeviceIntPtr dev) 1000, /* resolution */ 0, /* min_res */ 1000 /* max_res */ -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12 , Absolute -#endif ); InitValuatorAxisStruct(dev, 1, -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 axes_labels[1], -#endif 0, /* min val */ #if XORG_BOTCHED_INPUT screenInfo.screens[0]->height, @@ -693,23 +677,17 @@ DeviceInit (DeviceIntPtr dev) 1000, /* resolution */ 0, /* min_res */ 1000 /* max_res */ -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12 , Absolute -#endif ); InitValuatorAxisStruct(dev, 2, -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 axes_labels[2], -#endif 0, /* min val */ priv->acecadMaxZ, /* max val */ 1000, /* resolution */ 0, /* min_res */ 1000 /* max_res */ -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12 , Absolute -#endif ); } |