xf86-video-nv: src/compat-api.h
Adam Jackson
ajax at kemper.freedesktop.org
Tue Jul 19 14:12:49 UTC 2016
src/compat-api.h | 8 ++++++++
1 file changed, 8 insertions(+)
New commits:
commit 42e260a7ab630fdfa4664f467dad25e7178ff809
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 0a87cf5..62d9481 100644
--- a/src/compat-api.h
+++ b/src/compat-api.h
@@ -78,11 +78,19 @@
#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
+
+#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result
+#define WAKEUPHANDLER_ARGS arg, result
+#else
#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result, pointer read_mask
#define WAKEUPHANDLER_ARGS arg, result, read_mask
+#endif
#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
#define CLOSE_SCREEN_ARGS pScreen
More information about the xorg-commit
mailing list