diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-11-17 08:50:55 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-11-17 08:56:41 +1000 |
| commit | 866c952abc719d2261f26bec5cdd61a9dbe805db (patch) | |
| tree | ccf6ba135f5c51768a686be07bf5c0caafceecc9 | |
| parent | 17aa918f806118762fc63912fa875bcfafb589cb (diff) | |
Remove usages of XI_PRIVATE()
Removed from the server with ABI 12.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | src/xf86HyperPen.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/xf86HyperPen.c b/src/xf86HyperPen.c index b762149..515cbc6 100644 --- a/src/xf86HyperPen.c +++ b/src/xf86HyperPen.c @@ -74,8 +74,6 @@ #define XCONFIG_PROBED "(==)" #define XCONFIG_GIVEN "(**)" #define xf86Verbose 1 -#undef PRIVATE -#define PRIVATE(x) XI_PRIVATE(x) /* * Be sure to set vmin appropriately for your device's protocol. You want to @@ -685,7 +683,7 @@ static int xf86HypOpenDevice(DeviceIntPtr pHyp) { InputInfoPtr pInfo = (InputInfoPtr)pHyp->public.devicePrivate; - HyperPenDevicePtr priv = (HyperPenDevicePtr)PRIVATE(pHyp); + HyperPenDevicePtr priv = (HyperPenDevicePtr)(pInfo->private); #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 Atom axis_labels[3] = { 0 }; #endif @@ -743,7 +741,7 @@ xf86HypProc(DeviceIntPtr pHyp, int what) int nbbuttons; int loop; InputInfoPtr pInfo = (InputInfoPtr)pHyp->public.devicePrivate; - HyperPenDevicePtr priv = (HyperPenDevicePtr)PRIVATE(pHyp); + HyperPenDevicePtr priv = (HyperPenDevicePtr)(pInfo->private); #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 Atom btn_labels[4] = { 0 }; Atom axis_labels[3] = { 0 }; |