diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2019-08-08 12:23:35 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2019-08-08 12:23:35 +0000 |
| commit | 1c73fb2c5df9dd115871f593b6805ed094c521d4 (patch) | |
| tree | 8030e455be7bf6b74142efec3cdc67abc5c9f505 /driver | |
| parent | 48bf1f28b4584bbf36e8b82461a949ede6cfef8d (diff) | |
Adapt Block and Wakeup handlers prototypes to X server 1.20.
No functional change.
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/xf86-input-ws/src/emumb.c | 9 | ||||
| -rw-r--r-- | driver/xf86-input-ws/src/ws.h | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/driver/xf86-input-ws/src/emumb.c b/driver/xf86-input-ws/src/emumb.c index a4b3f1706..ab8c1534b 100644 --- a/driver/xf86-input-ws/src/emumb.c +++ b/driver/xf86-input-ws/src/emumb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: emumb.c,v 1.14 2015/12/25 15:08:28 matthieu Exp $ */ +/* $OpenBSD: emumb.c,v 1.15 2019/08/08 12:23:34 matthieu Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. * Copyright 1993 by David Dawes <dawes@xfree86.org> @@ -275,7 +275,7 @@ wsmbEmuFilterEvent(InputInfoPtr pInfo, int button, BOOL press) } void -wsmbEmuWakeupHandler(pointer data, int i, pointer LastSelectMask) +wsmbEmuWakeupHandler(pointer data, int i) { InputInfoPtr pInfo = (InputInfoPtr)data; WSDevicePtr priv = (WSDevicePtr)pInfo->private; @@ -289,8 +289,7 @@ wsmbEmuWakeupHandler(pointer data, int i, pointer LastSelectMask) } void -wsmbEmuBlockHandler(pointer data, struct timeval **waitTime, - pointer LastSelectMask) +wsmbEmuBlockHandler(pointer data, void *waitTime) { InputInfoPtr pInfo = (InputInfoPtr)data; WSDevicePtr priv = (WSDevicePtr)pInfo->private; @@ -300,7 +299,7 @@ wsmbEmuBlockHandler(pointer data, struct timeval **waitTime, ms = priv->emulateMB.expires - GetTimeInMillis(); if (ms <= 0) ms = 0; - AdjustWaitForDelay(waitTime, ms); + AdjustWaitForDelay((struct timeval **)waitTime, ms); } } diff --git a/driver/xf86-input-ws/src/ws.h b/driver/xf86-input-ws/src/ws.h index b4a7db145..322fddb2b 100644 --- a/driver/xf86-input-ws/src/ws.h +++ b/driver/xf86-input-ws/src/ws.h @@ -103,8 +103,8 @@ typedef struct WSDevice { /* Middle mouse button emulation */ extern int wsmbEmuTimer(InputInfoPtr); extern BOOL wsmbEmuFilterEvent(InputInfoPtr, int, BOOL); -extern void wsmbEmuWakeupHandler(pointer, int, pointer); -extern void wsmbEmuBlockHandler(pointer, struct timeval **, pointer); +extern void wsmbEmuWakeupHandler(pointer, int); +extern void wsmbEmuBlockHandler(pointer, pointer); extern void wsmbEmuPreInit(InputInfoPtr); extern void wsmbEmuOn(InputInfoPtr); extern void wsmbEmuFinalize(InputInfoPtr); |