summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2012-03-23 16:25:54 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2012-05-10 10:06:25 +1000
commitebd36c7494062e9f9a47fcd20148de886ebdd46a (patch)
tree97a41a930d3029a4df11e2033eb6537144b047bc /tools
parent3430f4af41184752d698dcbf4919469e36b3216c (diff)
Move synaptics.h leftovers to synapticsstr.h, drop synaptics.h
This leaves us with a duplicated define for the maxbuttons but I'll live with that for now. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Chase Douglas <chase.douglas@canonical.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/synclient.c3
-rw-r--r--tools/syndaemon.c1
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/synclient.c b/tools/synclient.c
index 74eb504..4623728 100644
--- a/tools/synclient.c
+++ b/tools/synclient.c
@@ -43,13 +43,14 @@
#include <X11/Xatom.h>
#include <X11/extensions/XI.h>
#include <X11/extensions/XInput.h>
-#include "synaptics.h"
#include "synaptics-properties.h"
#ifndef XATOM_FLOAT
#define XATOM_FLOAT "FLOAT"
#endif
+#define SYN_MAX_BUTTONS 12
+
union flong { /* Xlibs 64-bit property handling madness */
long l;
float f;
diff --git a/tools/syndaemon.c b/tools/syndaemon.c
index 5109052..d24f09c 100644
--- a/tools/syndaemon.c
+++ b/tools/syndaemon.c
@@ -45,7 +45,6 @@
#include <sys/time.h>
#include <sys/stat.h>
-#include "synaptics.h"
#include "synaptics-properties.h"
typedef enum {