summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2012-03-24 19:52:35 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2012-03-26 07:43:04 +1000
commitbc95d90be17d52726b85c785a8e7503512e8fa3d (patch)
tree3aa5cd55a44f19d134a4e5a58540c3cc147436f6
parent291fdc69801c91310839fc8667ba7aa2e9a66b95 (diff)
Define various EVIOCGPROP bits if non-existent
And make the ioctl conditional. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
-rw-r--r--src/eventcomm.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/eventcomm.c b/src/eventcomm.c
index 3721c91..cd89180 100644
--- a/src/eventcomm.c
+++ b/src/eventcomm.c
@@ -45,6 +45,12 @@
#include <mtdev.h>
#endif
+#ifndef INPUT_PROP_BUTTONPAD
+#define INPUT_PROP_BUTTONPAD 0x02
+#endif
+#ifndef INPUT_PROP_SEMI_MT
+#define INPUT_PROP_SEMI_MT 0x03
+#endif
#define SYSCALL(call) while (((call) == -1) && (errno == EINTR))
@@ -760,6 +766,7 @@ event_query_touch(InputInfoPtr pInfo)
priv->max_touches = 0;
priv->num_mt_axes = 0;
+#ifdef EVIOCGPROP
SYSCALL(rc = ioctl(pInfo->fd, EVIOCGPROP(sizeof(prop)), &prop));
if (rc >= 0 && BitIsOn(&prop, INPUT_PROP_SEMI_MT))
{
@@ -773,6 +780,7 @@ event_query_touch(InputInfoPtr pInfo)
xf86IDrvMsg(pInfo, X_INFO, "found clickpad property\n");
para->clickpad = TRUE;
}
+#endif
mtdev = mtdev_new_open(pInfo->fd);
if (!mtdev)