xserver-xorg-video-tdfx: Changes to 'upstream-unstable'
configure.ac | 2 +-
src/compat-api.h | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 4dd4a5da0697d33df0f456ccf224d5be945b7aab
Author: Matt Turner <mattst88@gmail.com>
Date: Tue Jan 17 14:48:21 2017 -0800
xf86-video-tdfx 1.4.7
Signed-off-by: Matt Turner <mattst88@gmail.com>
diff --git a/configure.ac b/configure.ac
index ead618e..798577e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-tdfx],
- [1.4.6],
+ [1.4.7],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-tdfx])
AC_CONFIG_SRCDIR([Makefile.am])
commit b99390efcb55d7d4a68e8c595119c1af4426fc0b
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jul 19 10:03:56 2016 -0400
Adapt Block/WakeupHandler signature for ABI 23
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/compat-api.h b/src/compat-api.h
index 98ba435..44daea4 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
Reply to: