[Openchrome-devel] xf86-video-openchrome: 2 commits - configure.ac src/compat-api.h

[Kevin Brace]

 configure.ac     |    2 +-
 src/compat-api.h |    5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit aa7e5477346e25616996a3de0d6f4537f603ab96
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Wed Dec 21 21:01:39 2016 -0800

    Version bumped to 0.5.174
    
    Now, OpenChrome DDX is compatible with ABI 23.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/configure.ac b/configure.ac
index 69f928a..8a31e61 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-openchrome],
-        [0.5.173],
+        [0.5.174],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
         [xf86-video-openchrome])
 
commit bbbf0bb27ecc976e3018724dc4bd3273d98c0d8c
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Dec 21 20:53:21 2016 -0800

    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 f930294..1702aa3 100644
--- a/src/compat-api.h
+++ b/src/compat-api.h
@@ -74,8 +74,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