configure.ac | 2 +- src/compat-api.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-)
New commits: commit dadf45e8eb52ec8404ee596ee13984470b736fbd Author: Matt Turner <[email protected]> Date: Tue Jan 17 14:48:51 2017 -0800 xf86-video-trident 1.3.8 Signed-off-by: Matt Turner <[email protected]> diff --git a/configure.ac b/configure.ac index 89fa22a..f07c86a 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-trident], - [1.3.7], + [1.3.8], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-trident]) AC_CONFIG_SRCDIR([Makefile.am]) commit b5f4d35327863a14224d2a63885cd8b3b83a1815 Author: Adam Jackson <[email protected]> Date: Tue Jul 19 10:03:56 2016 -0400 Adapt Block/WakeupHandler signature for ABI 23 Signed-off-by: Adam Jackson <[email protected]> diff --git a/src/compat-api.h b/src/compat-api.h index 6bc946f..89976e4 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
