diff options
| author | Keith Packard <keithp@keithp.com> | 2013-12-15 01:05:51 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-01-12 10:24:11 -0800 |
| commit | 60014a4a98ff924ae7f6840781f768c1cc93bbab (patch) | |
| tree | a956a03a6a7c87cac4d48fb95b66fec313d87fde /xkb/xkbActions.c | |
| parent | 93fa64e17d7bd600ebf18ecab85f5b2d17fe30ce (diff) | |
Replace 'pointer' type with 'void *'
This lets us stop using the 'pointer' typedef in Xdefs.h as 'pointer'
is used throughout the X server for other things, and having duplicate
names generates compiler warnings.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'xkb/xkbActions.c')
| -rw-r--r-- | xkb/xkbActions.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c index e32005cf6..1443498f6 100644 --- a/xkb/xkbActions.c +++ b/xkb/xkbActions.c @@ -51,7 +51,7 @@ static void XkbFakePointerMotion(DeviceIntPtr dev, unsigned flags, int x, int y); void -xkbUnwrapProc(DeviceIntPtr device, DeviceHandleProc proc, pointer data) +xkbUnwrapProc(DeviceIntPtr device, DeviceHandleProc proc, void *data) { xkbDeviceInfoPtr xkbPrivPtr = XKBDEVICEINFO(device); ProcessInputProc backupproc; @@ -470,7 +470,7 @@ _XkbFilterISOLock(XkbSrvInfoPtr xkbi, } static CARD32 -_XkbPtrAccelExpire(OsTimerPtr timer, CARD32 now, pointer arg) +_XkbPtrAccelExpire(OsTimerPtr timer, CARD32 now, void *arg) { XkbSrvInfoPtr xkbi = (XkbSrvInfoPtr) arg; XkbControlsPtr ctrls = xkbi->desc->ctrls; @@ -540,7 +540,7 @@ _XkbFilterPointerMove(XkbSrvInfoPtr xkbi, xkbi->mouseKeysDY = XkbPtrActionY(&pAction->ptr); xkbi->mouseKeyTimer = TimerSet(xkbi->mouseKeyTimer, 0, xkbi->desc->ctrls->mk_delay, - _XkbPtrAccelExpire, (pointer) xkbi); + _XkbPtrAccelExpire, (void *) xkbi); } else if (filter->keycode == keycode) { filter->active = 0; |