summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2016-07-19 10:21:03 -0400
committerAdam Jackson <ajax@redhat.com>2016-07-19 10:21:03 -0400
commit58a04ad9c750d6d978ad2206e18845a278e4bb28 (patch)
tree2a0344ed9c1ef700e54bcc84a7b0acc253f8b414
parent43d38354eea3f59fb24693c8e5a394863bef278e (diff)
Adapt Block/WakeupHandler signature for ABI 23
Signed-off-by: Adam Jackson <ajax@redhat.com>
-rw-r--r--src/compat-api.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/compat-api.h b/src/compat-api.h
index fefbc59..78d3c91 100644
--- a/src/compat-api.h
+++ b/src/compat-api.h
@@ -77,9 +77,15 @@
#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