summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu.herrb@laas.fr>2011-02-28 21:57:44 +0100
committerMatthieu Herrb <matthieu.herrb@laas.fr>2011-02-28 21:57:44 +0100
commit029109fcb286a1e3965e2caeab044d53df350f64 (patch)
treed9a58a1d7aa6418152de2373d9a09bb280b9d5eb
parent6a4d422f0f0d17f92de06fd006dbb67c613f299f (diff)
Don't use Xalloc & friends with recent X servers.
-rw-r--r--src/ws.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/ws.c b/src/ws.c
index 9072fff..8a7b2c8 100644
--- a/src/ws.c
+++ b/src/ws.c
@@ -36,6 +36,17 @@
#include <mipointer.h>
#include <extinit.h>
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) > 10
+#undef xalloc
+#undef xcalloc
+
+#define xcalloc calloc
+#define xalloc malloc
+#define Xcalloc calloc
+#define Xalloc malloc
+#define Xfree free
+#endif
+
#include "ws.h"
#ifdef HAVE_PROPERTIES