diff options
| author | Laurent Carlier | 2017-01-14 21:22:26 +0100 |
|---|---|---|
| committer | Laurent Carlier | 2017-01-14 21:22:26 +0100 |
| commit | 9a5e5ab2a28037ce9b54337512448986a23210cb (patch) | |
| tree | 535c389013621775cd21afc276940464c0c51da9 /git-fixes.patch | |
| download | aur-9a5e5ab2a28037ce9b54337512448986a23210cb.tar.gz | |
moved from extra
Diffstat (limited to 'git-fixes.patch')
| -rw-r--r-- | git-fixes.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/git-fixes.patch b/git-fixes.patch new file mode 100644 index 000000000000..ae7d22df862e --- /dev/null +++ b/git-fixes.patch @@ -0,0 +1,28 @@ +From 74e5a49cbf3b99ce0eb2b78a47a9008a1900bcf4 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 19 Jul 2016 10:03:56 -0400 +Subject: 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 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 +-- +cgit v0.10.2 + |