summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2014-01-03 11:23:22 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2014-01-13 15:13:19 +1000
commitb227ca373de79fe6852ac09e71465c048790cd5b (patch)
tree809820d3ebbd9334b878329f76599b175eec4c0a
parent88d926d12a1f5c06ee2825de5bc4b2222ec29c78 (diff)
Fix ABI detection for in-driver scaling
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> (cherry picked from commit 49fe70e99d1b0932ab915824c78f952a0fdb3ee7)
-rw-r--r--src/synapticsstr.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/synapticsstr.h b/src/synapticsstr.h
index a9901a2..3d6f756 100644
--- a/src/synapticsstr.h
+++ b/src/synapticsstr.h
@@ -28,13 +28,13 @@
#define LogMessageVerbSigSafe xf86MsgVerb
#endif
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 19
-#if GET_ABI_MINOR(ABI_XINPUT_VERSION) >= 2
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) > 19
+#define NO_DRIVER_SCALING 1
+#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 19 && GET_ABI_MINOR(ABI_XINPUT_VERSION) >= 2
/* as of 19.2, the server takes device resolution into account when scaling
relative events from abs device, so we must not scale in synaptics. */
#define NO_DRIVER_SCALING 1
#endif
-#endif
#ifdef DBG
#undef DBG