Thread (2 messages) 2 messages, 1 author, 2015-10-06
STALE4002d

[PATCH 98/98] HACK include/uapi/linux/errqueue.h: include time.h in userspace

From: Mikko Rapeli <hidden>
Date: 2015-05-30 16:29:59
Also in: lkml
Subsystem: the rest · Maintainer: Linus Torvalds

linux/time.h conflicts with userspace header time.h. Try to be compatible
for kernel and userspace.

Signed-off-by: Mikko Rapeli <redacted>
---
 include/uapi/linux/errqueue.h | 5 +++++
 1 file changed, 5 insertions(+)
diff --git a/include/uapi/linux/errqueue.h b/include/uapi/linux/errqueue.h
index 6b1cdc6..b310b2c 100644
--- a/include/uapi/linux/errqueue.h
+++ b/include/uapi/linux/errqueue.h
@@ -2,7 +2,12 @@
 #define _UAPI_LINUX_ERRQUEUE_H
 
 #include <linux/types.h>
+
+#ifdef __KERNEL__
 #include <linux/time.h>
+#else
+#include <time.h>
+#endif /* __KERNEL__ */
 
 struct sock_extended_err {
 	__u32	ee_errno;	
-- 
2.1.4
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help