On Sun, Aug 6, 2017 at 4:23 PM, Willem de Bruijn <willemdebruijn.ker...@gmail.com> wrote: > On Sun, Aug 6, 2017 at 12:44 PM, Mikko Rapeli <mikko.rap...@iki.fi> wrote: >> 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 <mikko.rap...@iki.fi> >> Cc: Willem de Bruijn <will...@google.com> >> Cc: Soheil Hassas Yeganeh <soh...@google.com> >> 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__ */ > > This will break applications that include <linux/time.h> manually.
Also, the patch title reads "include <linux/time.h> in user space", but it includes <time.h> in that environment.
