From 5c82dc7874b6eaff39dc8c8575e72e5a40f13ea6 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 19 Jul 2016 10:03:56 -0400 Subject: [PATCH 1/3] Adapt Block/WakeupHandler signature for ABI 23 Signed-off-by: Adam Jackson --- src/compat-api.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/compat-api.h b/src/compat-api.h index 4f7b9ea..15b92fe 100644 --- a/src/compat-api.h +++ b/src/compat-api.h @@ -76,8 +76,13 @@ #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv +#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0) +#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout +#define BLOCKHANDLER_ARGS arg, pTimeout +#else #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask +#endif #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen #define CLOSE_SCREEN_ARGS pScreen -- 2.11.0