Signed-off-by: Peter Hutterer <[email protected]>
---
src/xf86Aiptek.c | 4 ++--
src/xf86Aiptek.h | 3 ---
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/xf86Aiptek.c b/src/xf86Aiptek.c
index 43a6ae8..7dabda8 100644
--- a/src/xf86Aiptek.c
+++ b/src/xf86Aiptek.c
@@ -1167,7 +1167,7 @@ static int
xf86AiptekOpenDevice(DeviceIntPtr pDriver)
{
InputInfoPtr pInfo = (InputInfoPtr)pDriver->public.devicePrivate;
- AiptekDevicePtr device = (AiptekDevicePtr)PRIVATE(pDriver);
+ AiptekDevicePtr device = pInfo->private;
AiptekCommonPtr common = device->common;
double tabletRatio, screenRatio;
double xFactor, yFactor;
@@ -1593,7 +1593,7 @@ xf86AiptekProc(DeviceIntPtr pAiptek, int requestCode)
int numButtons = 5;
int loop;
InputInfoPtr pInfo = (InputInfoPtr)pAiptek->public.devicePrivate;
- AiptekDevicePtr device = (AiptekDevicePtr)PRIVATE(pAiptek);
+ AiptekDevicePtr device = pInfo->private;
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
Atom btn_labels[numAxes];
Atom axes_labels[numButtons];
diff --git a/src/xf86Aiptek.h b/src/xf86Aiptek.h
index e0ed603..989acc5 100644
--- a/src/xf86Aiptek.h
+++ b/src/xf86Aiptek.h
@@ -87,9 +87,6 @@
#define xf86Verbose 1
-#undef PRIVATE
-#define PRIVATE(x) XI_PRIVATE(x)
-
#define CURSOR_SECTION_NAME "AiptekCursor"
#define STYLUS_SECTION_NAME "AiptekStylus"
#define ERASER_SECTION_NAME "AiptekEraser"
--
1.7.3.2
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
