diff options
author | marha <marha@users.sourceforge.net> | 2014-01-15 21:23:25 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-01-15 21:23:25 +0100 |
commit | 1b0fcca503ae9cf2d462b60770f96c794dfbb27a (patch) | |
tree | d08c81de02b94da202195d84c99e192bc24ae69e /xorg-server/hw/dmx/input/lnx-ps2.h | |
parent | aaeb8bf497c82efabc4f9b27c319042c0e72d816 (diff) | |
download | vcxsrv-1b0fcca503ae9cf2d462b60770f96c794dfbb27a.tar.gz vcxsrv-1b0fcca503ae9cf2d462b60770f96c794dfbb27a.tar.bz2 vcxsrv-1b0fcca503ae9cf2d462b60770f96c794dfbb27a.zip |
mesa xkeyboard-config xserver git update 15 jan 2014
xserver commit 2d2d49dab5c5718989de97d7227aac793479745e
xkeyboard-config commit 78af7aa79c6552924295644b911e45d07a0fcdad
mesa commit a05c596a00916ce6a9c9d35ff36cd1e401fddd43
Diffstat (limited to 'xorg-server/hw/dmx/input/lnx-ps2.h')
-rw-r--r-- | xorg-server/hw/dmx/input/lnx-ps2.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xorg-server/hw/dmx/input/lnx-ps2.h b/xorg-server/hw/dmx/input/lnx-ps2.h index 93f0f0219..339f3538c 100644 --- a/xorg-server/hw/dmx/input/lnx-ps2.h +++ b/xorg-server/hw/dmx/input/lnx-ps2.h @@ -37,8 +37,8 @@ #ifndef _LNX_PS2_H_ #define _LNX_PS2_H_ -extern pointer ps2LinuxCreatePrivate(DeviceIntPtr pMouse); -extern void ps2LinuxDestroyPrivate(pointer priv); +extern void *ps2LinuxCreatePrivate(DeviceIntPtr pMouse); +extern void ps2LinuxDestroyPrivate(void *priv); extern void ps2LinuxRead(DevicePtr pDev, dmxMotionProcPtr motion, dmxEnqueueProcPtr enqueue, @@ -49,7 +49,7 @@ extern void ps2LinuxGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info); extern int ps2LinuxOn(DevicePtr pDev); extern void ps2LinuxOff(DevicePtr pDev); extern void ps2LinuxCtrl(DevicePtr pDev, PtrCtrl * ctrl); -extern void ps2LinuxVTPreSwitch(pointer p); -extern void ps2LinuxVTPostSwitch(pointer p); +extern void ps2LinuxVTPreSwitch(void *p); +extern void ps2LinuxVTPostSwitch(void *p); #endif |