diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-12-14 15:19:08 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-12-16 12:43:06 +1000 |
| commit | 135aaf612bcb591ae1692ae47b2d36a814230cbe (patch) | |
| tree | a3530f9de84806cc4484dcb643115ffdc31e4d40 | |
| parent | 29a486ba56bc6279297a716b018ba24880680e82 (diff) | |
Purge use of XI_PRIVATE macro.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Trevor Woerner <twoerner@gmail.com>
| -rw-r--r-- | src/jstk.c | 2 | ||||
| -rw-r--r-- | src/jstk_axis.c | 6 | ||||
| -rw-r--r-- | src/jstk_key.c | 3 |
3 files changed, 7 insertions, 4 deletions
@@ -293,7 +293,7 @@ jstkDeviceControlProc(DeviceIntPtr pJstk, { int i; InputInfoPtr pInfo = (InputInfoPtr)pJstk->public.devicePrivate; - JoystickDevPtr priv = (JoystickDevPtr)XI_PRIVATE(pJstk); + JoystickDevPtr priv = pInfo->private; Atom btn_labels[BUTTONMAP_SIZE+1] = {0}; /* TODO: fillme */ Atom axes_labels[MAXAXES] = {0}; /* TODO: fillme */ diff --git a/src/jstk_axis.c b/src/jstk_axis.c index 7bea816..95ebfe9 100644 --- a/src/jstk_axis.c +++ b/src/jstk_axis.c @@ -56,7 +56,8 @@ jstkAxisTimer(OsTimerPtr timer, { #define NEXTTIMER 15 DeviceIntPtr device = (DeviceIntPtr)arg; - JoystickDevPtr priv = (JoystickDevPtr)XI_PRIVATE(device); + InputInfoPtr pInfo = device->public.devicePrivate; + JoystickDevPtr priv = pInfo->private; int sigstate, i; int nexttimer; @@ -407,7 +408,8 @@ jstkPWMAxisTimer(OsTimerPtr timer, pointer arg) { DeviceIntPtr device = (DeviceIntPtr)arg; - JoystickDevPtr priv = (JoystickDevPtr)XI_PRIVATE(device); + InputInfoPtr pInfo = device->public.devicePrivate; + JoystickDevPtr priv = pInfo->private; int sigstate, i; int nexttimer; diff --git a/src/jstk_key.c b/src/jstk_key.c index c3636b6..cdbd440 100644 --- a/src/jstk_key.c +++ b/src/jstk_key.c @@ -141,7 +141,8 @@ static Bool jstkKeyboardDeviceControlProc(DeviceIntPtr dev, int what) { - JoystickDevPtr priv = (JoystickDevPtr)XI_PRIVATE(dev); + InputInfoPtr pInfo = dev->public.devicePrivate; + JoystickDevPtr priv = pInfo->private; if (!priv) { DBG(2, ErrorF("jstkKeyboardDeviceControlProc: priv == NULL\n")); return !Success; |