2018-06-14 18:03:21 +00:00
|
|
|
From 9a0284605ceb91dbf1dfa49100f378dc6cb656a0 Mon Sep 17 00:00:00 2001
|
2017-01-13 03:19:27 +00:00
|
|
|
From: Adam Jackson <ajax@redhat.com>
|
|
|
|
Date: Tue, 19 Jul 2016 10:21:03 -0400
|
2018-06-14 18:03:21 +00:00
|
|
|
Subject: [PATCH 1/3] Adapt Block/WakeupHandler signature for ABI 23
|
2017-01-13 03:19:27 +00:00
|
|
|
|
|
|
|
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
|
|
|
---
|
|
|
|
src/compat-api.h | 6 ++++++
|
|
|
|
1 file changed, 6 insertions(+)
|
|
|
|
|
|
|
|
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
|
|
|
|
--
|
2018-06-14 18:03:21 +00:00
|
|
|
2.16.2
|
2017-01-13 03:19:27 +00:00
|
|
|
|