xf86-video-amdgpu: Branch 'master'

[Adam Jackson]

 src/compat-api.h |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 17c0cf49746a20fb25610c24a40c441f88c08365
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Jul 19 10:03:56 2016 -0400

    Adapt Block/WakeupHandler signature for ABI 23
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/src/compat-api.h b/src/compat-api.h
index b299f83..80a3ac4 100644
--- a/src/compat-api.h
+++ b/src/compat-api.h
@@ -73,8 +73,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