5c9789
From 0eadbb65c0026fb4eec89c54f6b48a0febd87f92 Mon Sep 17 00:00:00 2001
5c9789
From: Laura Abbott <labbott@redhat.com>
5c9789
Date: Fri, 9 Sep 2016 08:19:17 -0700
5c9789
Subject: [PATCH] iio: Use type header from kernel tree
5c9789
MIME-Version: 1.0
5c9789
Content-Type: text/plain; charset=UTF-8
5c9789
Content-Transfer-Encoding: 8bit
5c9789
To: Jonathan Cameron <jic23@kernel.org>
5c9789
To: Hartmut Knaack <knaack.h@gmx.de>
5c9789
To: Lars-Peter Clausen <lars@metafoo.de>
5c9789
To: Peter Meerwald-Stadler <pmeerw@pmeerw.net>
5c9789
Cc: linux-iio@vger.kernel.org
5c9789
Cc: linux-kernel@vger.kernel.org
5c9789
5c9789
5c9789
The iio tools have been updated as new event types have been added to
5c9789
the kernel. The tools currently use the standard system headers which
5c9789
means that the system may not have the newest defintitions. This leads
5c9789
to build failures when building newer tools on older hosts:
5c9789
5c9789
gcc -Wall -g -D_GNU_SOURCE   -c -o iio_event_monitor.o
5c9789
iio_event_monitor.c
5c9789
iio_event_monitor.c:59:3: error: ‘IIO_UVINDEX’ undeclared here (not in a
5c9789
function)
5c9789
  [IIO_UVINDEX] = "uvindex",
5c9789
   ^~~~~~~~~~~
5c9789
iio_event_monitor.c:59:3: error: array index in initializer not of
5c9789
integer type
5c9789
iio_event_monitor.c:59:3: note: (near initialization for
5c9789
‘iio_chan_type_name_spec’)
5c9789
iio_event_monitor.c:97:3: error: ‘IIO_MOD_LIGHT_UV’ undeclared here (not
5c9789
in a function)
5c9789
  [IIO_MOD_LIGHT_UV] = "uv",
5c9789
   ^~~~~~~~~~~~~~~~
5c9789
iio_event_monitor.c:97:3: error: array index in initializer not of
5c9789
integer type
5c9789
iio_event_monitor.c:97:3: note: (near initialization for
5c9789
‘iio_modifier_names’)
5c9789
<builtin>: recipe for target 'iio_event_monitor.o' failed
5c9789
5c9789
Switch to using the header from the kernel tree to ensure the newest
5c9789
defintions are always picked up.
5c9789
5c9789
Signed-off-by: Laura Abbott <labbott@redhat.com>
5c9789
---
5c9789
 tools/iio/iio_event_monitor.c | 2 +-
5c9789
 1 file changed, 1 insertion(+), 1 deletion(-)
5c9789
5c9789
diff --git a/tools/iio/iio_event_monitor.c b/tools/iio/iio_event_monitor.c
5c9789
index d9b7e0f..f02523d 100644
5c9789
--- a/tools/iio/iio_event_monitor.c
5c9789
+++ b/tools/iio/iio_event_monitor.c
5c9789
@@ -26,7 +26,7 @@
5c9789
 #include <sys/ioctl.h>
5c9789
 #include "iio_utils.h"
5c9789
 #include <linux/iio/events.h>
5c9789
-#include <linux/iio/types.h>
5c9789
+#include "../../include/uapi/linux/iio/types.h"
5c9789
 
5c9789
 static const char * const iio_chan_type_name_spec[] = {
5c9789
 	[IIO_VOLTAGE] = "voltage",
5c9789
-- 
5c9789
2.7.4
5c9789