Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1240954

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

Show all headers | View raw

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
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

Re: [PATCH 98/98] HACK include/uapi/linux/errqueue.h: include time.h  in userspace Mikko Rapeli <mikko.rapeli@iki.fi> - 2015-10-06 22:10 +0200

csiph-web