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/kdrive/linux/linux.c | |
| 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/kdrive/linux/linux.c')
| -rw-r--r-- | xorg-server/hw/kdrive/linux/linux.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/hw/kdrive/linux/linux.c b/xorg-server/hw/kdrive/linux/linux.c index 00de2ae0e..6284de576 100644 --- a/xorg-server/hw/kdrive/linux/linux.c +++ b/xorg-server/hw/kdrive/linux/linux.c @@ -167,14 +167,14 @@ LinuxSetSwitchMode(int mode) } static void -LinuxApmBlock(pointer blockData, OSTimePtr pTimeout, pointer pReadmask) +LinuxApmBlock(void *blockData, OSTimePtr pTimeout, void *pReadmask) { } static Bool LinuxApmRunning; static void -LinuxApmWakeup(pointer blockData, int result, pointer pReadmask) +LinuxApmWakeup(void *blockData, int result, void *pReadmask) { fd_set *readmask = (fd_set *) pReadmask; |