summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2012-08-20 13:21:37 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2013-01-22 09:59:37 +1000
commitc95c1f2c2d449f78eae109b927db85db05ab9a6f (patch)
tree20a77d38191303cce9da951607608890e75e8c9d /include
parentbc2de318b5ad131fb60d3c5a057c185f764969a1 (diff)
downloadxf86-input-wacom-c95c1f2c2d449f78eae109b927db85db05ab9a6f.tar.gz
include: don't redefine ARRAY_SIZE
The server provides this macro in its headers, so only redefine it where needed (for the tools) Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'include')
-rw-r--r--include/wacom-util.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/wacom-util.h b/include/wacom-util.h
index ed42947..e9d860a 100644
--- a/include/wacom-util.h
+++ b/include/wacom-util.h
@@ -22,7 +22,9 @@
/**
* Get the number of elements in an array
*/
+#ifndef ARRAY_SIZE
#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0]))
+#endif
/* to access kernel defined bits */
#define BIT(x) (1UL<<((x) & (BITS_PER_LONG - 1)))