From 0152dd78f6568befec61e1738f5d2a6f893b57e7 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 19 Jul 2016 09:53:16 -0400 Subject: Adapt Block/WakeupHandler signature for ABI 23 Signed-off-by: Adam Jackson --- src/compat-api.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/compat-api.h b/src/compat-api.h index 98ba435..7f96c50 100644 --- a/src/compat-api.h +++ b/src/compat-api.h @@ -48,11 +48,19 @@ #define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv +#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0) +#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout +#define BLOCKHANDLER_ARGS arg, blockData, pTimeout + +#define WAKEUPHANDLER_ARGS_DECL int arg, pointer wakeupData, unsigned long result +#define WAKEUPHANDLER_ARGS arg, wakeupData, result +#else #define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask #define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask #define WAKEUPHANDLER_ARGS_DECL int arg, pointer wakeupData, unsigned long result, pointer read_mask #define WAKEUPHANDLER_ARGS arg, wakeupData, result, read_mask +#endif #define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen #define CLOSE_SCREEN_ARGS scrnIndex, pScreen -- cgit v1.2.3