diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-21 08:11:16 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-21 08:11:16 +0200 |
| commit | 478ec8cab167e7d8be4973fc3f8d425b1baa4496 (patch) | |
| tree | 0b05eb5a0e3a989a66baff04a954db416444f7c5 /xorg-server/hw/kdrive/src | |
| parent | 62d040da7ea0a76d48014b5247d98b428ca50a15 (diff) | |
| parent | da6ea6d64418710cbf7e0639dfefd2d856d53f1a (diff) | |
| download | vcxsrv-478ec8cab167e7d8be4973fc3f8d425b1baa4496.tar.gz vcxsrv-478ec8cab167e7d8be4973fc3f8d425b1baa4496.tar.bz2 vcxsrv-478ec8cab167e7d8be4973fc3f8d425b1baa4496.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/hw/kdrive/src')
| -rw-r--r-- | xorg-server/hw/kdrive/src/kdrive.h | 6 | ||||
| -rw-r--r-- | xorg-server/hw/kdrive/src/kinput.c | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/xorg-server/hw/kdrive/src/kdrive.h b/xorg-server/hw/kdrive/src/kdrive.h index a082acef3..9033adb88 100644 --- a/xorg-server/hw/kdrive/src/kdrive.h +++ b/xorg-server/hw/kdrive/src/kdrive.h @@ -537,13 +537,11 @@ void void -KdBlockHandler(ScreenPtr pScreen, - pointer blockData, pointer timeout, pointer readmask); +KdBlockHandler(ScreenPtr pScreen, pointer timeout, pointer readmask); void -KdWakeupHandler(ScreenPtr pScreen, - pointer data, unsigned long result, pointer readmask); +KdWakeupHandler(ScreenPtr pScreen, unsigned long result, pointer readmask); void KdDisableInput(void); diff --git a/xorg-server/hw/kdrive/src/kinput.c b/xorg-server/hw/kdrive/src/kinput.c index d94af6d0d..9778d1fee 100644 --- a/xorg-server/hw/kdrive/src/kinput.c +++ b/xorg-server/hw/kdrive/src/kinput.c @@ -1995,7 +1995,7 @@ _KdEnqueuePointerEvent(KdPointerInfo * pi, int type, int x, int y, int z, } void -KdBlockHandler(ScreenPtr pScreen, pointer blockData, pointer timeout, pointer readmask) +KdBlockHandler(ScreenPtr pScreen, pointer timeout, pointer readmask) { KdPointerInfo *pi; int myTimeout = 0; @@ -2021,8 +2021,7 @@ KdBlockHandler(ScreenPtr pScreen, pointer blockData, pointer timeout, pointer re } void -KdWakeupHandler(ScreenPtr pScreen, - pointer data, unsigned long lresult, pointer readmask) +KdWakeupHandler(ScreenPtr pScreen, unsigned long lresult, pointer readmask) { int result = (int) lresult; fd_set *pReadmask = (fd_set *) readmask; |