xorg-x11-drv-vmware/0001-Adapt-Block-WakeupHandler-signature-for-ABI-23.patch

33 lines
977 B
Diff
Raw Normal View History

From 55d8ea32a0aab73ea64b9b280fba08b2fe5bc5d9 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 xf86-video-vmware] Adapt Block/WakeupHandler signature for ABI
23
Signed-off-by: Hans de Goede <hdegoede@redhat.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.9.3