[PATCH 2/2] armada: Adapt to video API 23

[Christian Gmeiner]

Block and wakeup handlers lose their pReadmask arguments.

Signed-off-by: Christian Gmeiner <christian.gmeiner at gmail.com>
---
 common/compat-api.h     | 8 ++++++++
 common/unaccel_render.c | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/common/compat-api.h b/common/compat-api.h
index 993daa0..f41e57b 100644
--- a/common/compat-api.h
+++ b/common/compat-api.h
@@ -98,4 +98,12 @@
 
 #endif
 
+#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23,0)
+#undef BLOCKHANDLER_ARGS_DECL
+#undef BLOCKHANDLER_ARGS
+
+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, void *pTimeout
+#define BLOCKHANDLER_ARGS arg, pTimeout
+#endif
+
 #endif
diff --git a/common/unaccel_render.c b/common/unaccel_render.c
index 7617a21..ae2d7b2 100644
--- a/common/unaccel_render.c
+++ b/common/unaccel_render.c
@@ -11,6 +11,8 @@
 #include "config.h"
 #endif
 
+#include "xf86.h"
+
 #include "fb.h"
 #include "fbpict.h"
 #include "mipict.h"
-- 
2.10.2