From 1c73fb2c5df9dd115871f593b6805ed094c521d4 Mon Sep 17 00:00:00 2001 From: Matthieu Herrb Date: Thu, 8 Aug 2019 12:23:35 +0000 Subject: Adapt Block and Wakeup handlers prototypes to X server 1.20. No functional change. --- driver/xf86-input-ws/src/emumb.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'driver/xf86-input-ws/src/emumb.c') 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 @@ -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); } } -- cgit v1.2.3