kdrive: adjust BlockHandler/WakeupHandler to new API
Missing API update caused Xephyr to crash on startup, garbage memory
dereference when accessing timeout.
Introduced in 1f0e8bd5eb
kdrive.c:868:27: warning: assignment from incompatible pointer type
kdrive.c:869:28: warning: assignment from incompatible pointer type
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
parent
3f97284b10
commit
a0c8716cdc
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue
Block a user