debian/changelog | 7 +++++++ src/compat-api.h | 5 +++++ 2 files changed, 12 insertions(+)
New commits: commit 86fe76ee5f011bb37c0b2d648532d42bda3d7270 Author: Andreas Boll <[email protected]> Date: Fri Nov 18 12:12:44 2016 +0100 Document the cherry-pick in debian/changelog diff --git a/debian/changelog b/debian/changelog index cdfd4c1..a79c03a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xserver-xorg-video-r128 (6.10.1-2) UNRELEASED; urgency=medium + + * Cherry-pick commit 5ab23b3 (Adapt Block/WakeupHandler signature for + ABI 23) from upstream master branch. + + -- Andreas Boll <[email protected]> Fri, 18 Nov 2016 12:12:01 +0100 + xserver-xorg-video-r128 (6.10.1-1) unstable; urgency=medium * Team upload. commit eeaeb82363a3b29e1c0f45e727cb92a7d7912ddf 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]> (cherry picked from commit 5ab23b3a8ef18ab9ff96ac8be174380d36e185e5) 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
