From 13fb800c0c0803c05e1c310ec3ea2d1fc8651509 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 19 Dec 2025 15:13:01 +0100 Subject: [PATCH] drop compat with xserver < 24.0 Signed-off-by: Enrico Weigelt, metux IT consult --- src/emuMB.c | 4 ++-- src/evdev.h | 12 ++---------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/emuMB.c b/src/emuMB.c index 8f2ecb7..cf122af 100644 --- a/src/emuMB.c +++ b/src/emuMB.c @@ -266,7 +266,7 @@ EvdevMBEmuFilterEvent(InputInfoPtr pInfo, int button, BOOL press) } -void EvdevMBEmuWakeupHandler(WAKEUP_HANDLER_ARGS) +void EvdevMBEmuWakeupHandler(void *data, int i) { InputInfoPtr pInfo = (InputInfoPtr)data; EvdevPtr pEvdev = (EvdevPtr)pInfo->private; @@ -280,7 +280,7 @@ void EvdevMBEmuWakeupHandler(WAKEUP_HANDLER_ARGS) } } -void EvdevMBEmuBlockHandler(BLOCK_HANDLER_ARGS) +void EvdevMBEmuBlockHandler(void *data, void *waitTime) { InputInfoPtr pInfo = (InputInfoPtr) data; EvdevPtr pEvdev= (EvdevPtr) pInfo->private; diff --git a/src/evdev.h b/src/evdev.h index b7d305e..3fa1661 100644 --- a/src/evdev.h +++ b/src/evdev.h @@ -68,14 +68,6 @@ #define LED_CNT (LED_MAX+1) #endif -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 24 -#define BLOCK_HANDLER_ARGS void *data, void *waitTime -#define WAKEUP_HANDLER_ARGS void *data, int i -#else -#define BLOCK_HANDLER_ARGS pointer data, struct timeval **waitTime, pointer LastSelectMask -#define WAKEUP_HANDLER_ARGS void *data, int i, pointer LastSelectMask -#endif - #define EVDEV_MAXBUTTONS 32 #define EVDEV_MAXQUEUE 32 @@ -270,8 +262,8 @@ unsigned int EvdevUtilButtonEventToButtonNumber(EvdevPtr pEvdev, int code); /* Middle Button emulation */ int EvdevMBEmuTimer(InputInfoPtr); BOOL EvdevMBEmuFilterEvent(InputInfoPtr, int, BOOL); -void EvdevMBEmuWakeupHandler(WAKEUP_HANDLER_ARGS); -void EvdevMBEmuBlockHandler(BLOCK_HANDLER_ARGS); +void EvdevMBEmuWakeupHandler(void *data, int i); +void EvdevMBEmuBlockHandler(void *data, void *waitTime); void EvdevMBEmuPreInit(InputInfoPtr); void EvdevMBEmuOn(InputInfoPtr); void EvdevMBEmuFinalize(InputInfoPtr);