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

Groups > linux.kernel > #1599233

Re: [PATCH 1/4] uapi glibc compat: add libc compat code when not build for kernel

Show all headers | View raw

On Sun, Mar 12, 2017 at 11:00:36PM +0100, Hauke Mehrtens wrote:
> Instead of checking if this header file is used in the glibc, check if
> iti is not used in kernel context, this way it will also work with
> other libc implementations like musl.
> 
> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

Accked-by: Mikko Rapeli <mikko.rapeli@iki.fi>

> ---
>  include/uapi/linux/libc-compat.h | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h
> index 44b8a6bd5fe1..7c1fead03c50 100644
> --- a/include/uapi/linux/libc-compat.h
> +++ b/include/uapi/linux/libc-compat.h
> @@ -48,8 +48,8 @@
>  #ifndef _UAPI_LIBC_COMPAT_H
>  #define _UAPI_LIBC_COMPAT_H
>  
> -/* We have included glibc headers... */
> -#if defined(__GLIBC__)
> +/* We have included libc headers... */
> +#if !defined(__KERNEL__)
>  
>  /* Coordinate with glibc net/if.h header. */
>  #if defined(_NET_IF_H) && defined(__USE_MISC)
> @@ -168,7 +168,7 @@
>  /* If we did not see any headers from any supported C libraries,
>   * or we are being included in the kernel, then define everything
>   * that we need. */
> -#else /* !defined(__GLIBC__) */
> +#else /* defined(__KERNEL__) */
>  
>  /* Definitions for if.h */
>  #define __UAPI_DEF_IF_IFCONF 1
> @@ -208,6 +208,6 @@
>  /* Definitions for xattr.h */
>  #define __UAPI_DEF_XATTR		1
>  
> -#endif /* __GLIBC__ */
> +#endif /* __KERNEL__ */
>  
>  #endif /* _UAPI_LIBC_COMPAT_H */
> -- 
> 2.11.0
> 

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

Thread

[PATCH 1/4] uapi glibc compat: add libc compat code when not build for kernel Hauke Mehrtens <hauke@hauke-m.de> - 2017-03-12 23:10 +0100
  Re: [PATCH 1/4] uapi glibc compat: add libc compat code when not  build for kernel Mikko Rapeli <mikko.rapeli@iki.fi> - 2017-03-13 12:30 +0100

csiph-web