summarylogtreecommitdiffstats
path: root/git-fixes.patch
diff options
context:
space:
mode:
authorLaurent Carlier2017-01-14 21:24:05 +0100
committerLaurent Carlier2017-01-14 21:24:05 +0100
commit143f963072f45636555644319db86c410f7b6c0b (patch)
tree8aadacf0d32f16e30f2545f48c6ccd8af6fd544c /git-fixes.patch
downloadaur-xf86-video-trident.tar.gz
moved from extra
Diffstat (limited to 'git-fixes.patch')
-rw-r--r--git-fixes.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/git-fixes.patch b/git-fixes.patch
new file mode 100644
index 00000000000..401733302e9
--- /dev/null
+++ b/git-fixes.patch
@@ -0,0 +1,28 @@
+From b5f4d35327863a14224d2a63885cd8b3b83a1815 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
+