diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-21 08:09:37 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-21 08:09:37 +0200 |
| commit | da6ea6d64418710cbf7e0639dfefd2d856d53f1a (patch) | |
| tree | 23900712d7923a4e77aa095f68e7a955321ba538 /xorg-server/hw/kdrive/src | |
| parent | 36237c651fab7aa9e65da9c33eb89a619827edff (diff) | |
| download | vcxsrv-da6ea6d64418710cbf7e0639dfefd2d856d53f1a.tar.gz vcxsrv-da6ea6d64418710cbf7e0639dfefd2d856d53f1a.tar.bz2 vcxsrv-da6ea6d64418710cbf7e0639dfefd2d856d53f1a.zip | |
mesa pixman xkeyboard-config xserver git update 21 Jun 2012
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 a08a2182e..b37041f9b 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 58ae55278..0e06fd42f 100644 --- a/xorg-server/hw/kdrive/src/kinput.c +++ b/xorg-server/hw/kdrive/src/kinput.c @@ -1972,7 +1972,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; @@ -1998,8 +1998,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; |