summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2016-07-19 10:03:56 -0400
committerAdam Jackson <ajax@redhat.com>2016-07-19 10:13:04 -0400
commita964931e8dc4e06c27749edb4993a656dc261d75 (patch)
tree1432d4022a4cd35d1ecb7bf5bcf4bbb802a52134
parent12f77348e7a9579b167b41228dec9e6f97b74de8 (diff)
downloadxorg-driver-xf86-video-nouveau-a964931e8dc4e06c27749edb4993a656dc261d75.tar.gz
Adapt Block/WakeupHandler signature for ABI 23
Signed-off-by: Adam Jackson <ajax@redhat.com>
-rw-r--r--src/compat-api.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/compat-api.h b/src/compat-api.h
index b1591b1..5d63e10 100644
--- a/src/compat-api.h
+++ b/src/compat-api.h
@@ -74,8 +74,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