| Date | Tue, 6 Oct 2015 22:56:24 +0300 | From | Mikko Rapeli <> | Subject | Re: [PATCH 98/98] HACK include/uapi/linux/errqueue.h: include time.h in userspace |
| |
Hi,
On Sat, May 30, 2015 at 05:39:30PM +0200, Mikko Rapeli wrote: > linux/time.h conflicts with userspace header time.h. Try to be compatible > for kernel and userspace.
Any comments about this change? I assume the <linux/time.h> and <time.h> incompatibility in userspace is a known thing and the resulting definitions are compatible.
-Mikko
> Signed-off-by: Mikko Rapeli <mikko.rapeli@iki.fi> > --- > 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 >
|