diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2014-03-25 18:40:54 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-03-25 18:40:54 +0000 |
commit | d2bf04f6c61c8900da1ee537b3a630a484d2d2a8 (patch) | |
tree | 013ffbfcb161b409461d141afe798fce45c8d1b5 /main/linux-headers/3-4-libc-compat.h-fix-some-issues-arising-from-in6.h.patch | |
parent | e1f4fcf83fb502adee53388e7722721f2c11d2e3 (diff) | |
download | aports-d2bf04f6c61c8900da1ee537b3a630a484d2d2a8.tar.bz2 aports-d2bf04f6c61c8900da1ee537b3a630a484d2d2a8.tar.xz |
main/linux-headers: musl compat fixes
Diffstat (limited to 'main/linux-headers/3-4-libc-compat.h-fix-some-issues-arising-from-in6.h.patch')
-rw-r--r-- | main/linux-headers/3-4-libc-compat.h-fix-some-issues-arising-from-in6.h.patch | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/main/linux-headers/3-4-libc-compat.h-fix-some-issues-arising-from-in6.h.patch b/main/linux-headers/3-4-libc-compat.h-fix-some-issues-arising-from-in6.h.patch new file mode 100644 index 0000000000..e4ce3d6547 --- /dev/null +++ b/main/linux-headers/3-4-libc-compat.h-fix-some-issues-arising-from-in6.h.patch @@ -0,0 +1,61 @@ +--- ./include/uapi/linux/libc-compat.h.orig ++++ ./include/uapi/linux/libc-compat.h +@@ -48,35 +48,26 @@ + #ifndef _UAPI_LIBC_COMPAT_H + #define _UAPI_LIBC_COMPAT_H + +-/* We have included glibc headers... */ +-#if defined(__GLIBC__) ++#ifndef __KERNEL__ /* we're used from userspace */ + +-/* Coordinate with glibc netinet/in.h header. */ +-#if defined(_NETINET_IN_H) ++/* Coordinate with libc netinet/in.h header. */ ++#ifdef _NETINET_IN_H + + /* GLIBC headers included first so don't define anything + * that would already be defined. */ + #define __UAPI_DEF_IN6_ADDR 0 +-/* The exception is the in6_addr macros which must be defined +- * if the glibc code didn't define them. This guard matches +- * the guard in glibc/inet/netinet/in.h which defines the +- * additional in6_addr macros e.g. s6_addr16, and s6_addr32. */ +-#if defined(__USE_MISC) || defined (__USE_GNU) + #define __UAPI_DEF_IN6_ADDR_ALT 0 +-#else +-#define __UAPI_DEF_IN6_ADDR_ALT 1 +-#endif + #define __UAPI_DEF_SOCKADDR_IN6 0 + #define __UAPI_DEF_IPV6_MREQ 0 + #define __UAPI_DEF_IPPROTO_V6 0 + +-#else ++#else /* defined(_NETINET_IN_H) */ + + /* Linux headers included first, and we must define everything +- * we need. The expectation is that glibc will check the ++ * we need. The expectation is that the libc will check the + * __UAPI_DEF_* defines and adjust appropriately. */ + #define __UAPI_DEF_IN6_ADDR 1 +-/* We unconditionally define the in6_addr macros and glibc must ++/* We unconditionally define the in6_addr macros and the libc must + * coordinate. */ + #define __UAPI_DEF_IN6_ADDR_ALT 1 + #define __UAPI_DEF_SOCKADDR_IN6 1 +@@ -89,7 +80,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 /* __KERNEL__ */ + + /* Definitions for in6.h */ + #define __UAPI_DEF_IN6_ADDR 1 +@@ -98,6 +89,6 @@ + #define __UAPI_DEF_IPV6_MREQ 1 + #define __UAPI_DEF_IPPROTO_V6 1 + +-#endif /* __GLIBC__ */ ++#endif /* __KERNEL__ */ + + #endif /* _UAPI_LIBC_COMPAT_H */ |