| Message ID | 20170312220039.16885-2-hauke@hauke-m.de |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
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 >
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 */
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> --- include/uapi/linux/libc-compat.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)