diff options
author | Laurent Carlier | 2017-01-14 21:23:57 +0100 |
---|---|---|
committer | Laurent Carlier | 2017-01-14 21:23:57 +0100 |
commit | 8c397292322ed3c14971fefb0e2127676b56a554 (patch) | |
tree | 8bc7834b55a28df86c8b649bd12d7e76fca047bd /git-fixes.patch | |
download | aur-8c397292322ed3c14971fefb0e2127676b56a554.tar.gz |
moved from extra
Diffstat (limited to 'git-fixes.patch')
-rw-r--r-- | git-fixes.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/git-fixes.patch b/git-fixes.patch new file mode 100644 index 000000000000..28020e89353a --- /dev/null +++ b/git-fixes.patch @@ -0,0 +1,34 @@ +From b99390efcb55d7d4a68e8c595119c1af4426fc0b 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 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 +-- +cgit v0.10.2 + |