From 9100bafac77ce166b1a2a13ceb32ce6b85ce4f99 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 17 Nov 2010 08:57:56 +1000
Subject: Unifdef pre ABI 12 conditions.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 src/xf86HyperPen.c | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/src/xf86HyperPen.c b/src/xf86HyperPen.c
index c9b2ad0..ad4e061 100644
--- a/src/xf86HyperPen.c
+++ b/src/xf86HyperPen.c
@@ -688,9 +688,7 @@ xf86HypOpenDevice(DeviceIntPtr pHyp)
 {
     InputInfoPtr    pInfo = (InputInfoPtr)pHyp->public.devicePrivate;
     HyperPenDevicePtr priv = (HyperPenDevicePtr)(pInfo->private);
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
     Atom axis_labels[3] = { 0 };
-#endif
 
     if (xf86HypOpen(pInfo) != Success) {
         if (pInfo->fd >= 0) {
@@ -702,9 +700,7 @@ xf86HypOpenDevice(DeviceIntPtr pHyp)
     /* Set the real values */
     InitValuatorAxisStruct(pHyp,
                            0,
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
                            axis_labels[0],
-#endif
                            0, /* min val */
                            priv->hypXSize, /* max val */
                            LPI2CPM(priv->hypRes), /* resolution */
@@ -712,9 +708,7 @@ xf86HypOpenDevice(DeviceIntPtr pHyp)
                            LPI2CPM(priv->hypRes)); /* max_res */
     InitValuatorAxisStruct(pHyp,
                            1,
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
                            axis_labels[1],
-#endif
                            0, /* min val */
                            priv->hypYSize, /* max val */
                            LPI2CPM(priv->hypRes), /* resolution */
@@ -722,9 +716,7 @@ xf86HypOpenDevice(DeviceIntPtr pHyp)
                            LPI2CPM(priv->hypRes)); /* max_res */
     InitValuatorAxisStruct(pHyp,
                            2,
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
                            axis_labels[2],
-#endif
                            0, /* min val */
                            511, /* max val */
                            512, /* resolution */
@@ -746,10 +738,8 @@ xf86HypProc(DeviceIntPtr pHyp, int what)
     int            loop;
     InputInfoPtr    pInfo = (InputInfoPtr)pHyp->public.devicePrivate;
     HyperPenDevicePtr priv = (HyperPenDevicePtr)(pInfo->private);
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
     Atom btn_labels[4] = { 0 };
     Atom axis_labels[3] = { 0 };
-#endif
 
     switch (what) {
     case DEVICE_INIT:
@@ -762,9 +752,7 @@ xf86HypProc(DeviceIntPtr pHyp, int what)
 
         if (InitButtonClassDeviceStruct(pHyp,
                                         nbbuttons,
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
                                         btn_labels,
-#endif
                                         map) == FALSE) {
             ErrorF("unable to allocate Button class device\n");
             return !Success;
@@ -788,12 +776,7 @@ xf86HypProc(DeviceIntPtr pHyp, int what)
 
         if (InitValuatorClassDeviceStruct(pHyp,
                                           nbaxes,
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
                                           axis_labels,
-#endif
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
-                                          xf86GetMotionEvents,
-#endif
                                           pInfo->history_size,
                                           (priv->flags & ABSOLUTE_FLAG)? Absolute: Relative)
             == FALSE) {
-- 
cgit v1.2.3