33 lines
1010 B
Diff
33 lines
1010 B
Diff
From d64d01c7a599dc3c79125701f076a3e459cefdc2 Mon Sep 17 00:00:00 2001
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
|
Date: Thu, 29 Sep 2016 19:37:22 +0200
|
|
Subject: [PATCH] Adapt Block/WakeupHandler signature for ABI 23
|
|
|
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
Acked-by: Thomas Hellstrom <thellstrom@vmware.com>
|
|
---
|
|
src/compat-api.h | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/src/compat-api.h b/src/compat-api.h
|
|
index 205ac59..02876c5 100644
|
|
--- a/src/compat-api.h
|
|
+++ b/src/compat-api.h
|
|
@@ -75,8 +75,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
|
|
--
|
|
2.12.2
|
|
|