Thread (89 messages) 89 messages, 13 authors, 2017-09-18
STALE3296d

Revision v06 of 4 in this series.

Revisions (4)
  1. v03 [diff vs current]
  2. v4 [diff vs current]
  3. v05 [diff vs current]
  4. v06 current

[PATCH v06 18/36] uapi linux/errqueue.h: include linux/time.h in user space

From: Mikko Rapeli <hidden>
Date: 2017-08-06 17:24:07
Also in: lkml, netdev
Subsystem: the rest · Maintainer: Linus Torvalds

linux/time.h conflicts with user space header time.h. Try to be compatible
with both.

Fixes userspace compilation error:

error: array type has incomplete element type
 struct timespec ts[3];

Signed-off-by: Mikko Rapeli <redacted>
Cc: Willem de Bruijn <willemb@google.com>
Cc: Soheil Hassas Yeganeh <redacted>
Cc: netdev@vger.kernel.org
---
 include/uapi/linux/errqueue.h | 6 ++++++
 1 file changed, 6 insertions(+)
diff --git a/include/uapi/linux/errqueue.h b/include/uapi/linux/errqueue.h
index 07bdce1f444a..b310b2c6d94f 100644
--- a/include/uapi/linux/errqueue.h
+++ b/include/uapi/linux/errqueue.h
@@ -3,6 +3,12 @@
 
 #include <linux/types.h>
 
+#ifdef __KERNEL__
+#include <linux/time.h>
+#else
+#include <time.h>
+#endif /* __KERNEL__ */
+
 struct sock_extended_err {
 	__u32	ee_errno;	
 	__u8	ee_origin;
-- 
2.13.3
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help