summaryrefslogtreecommitdiff
path: root/target/linux/generic/patches-4.4/271-uapi-libc-compat.h-do-not-rely-on-__GLIBC__.patch
diff options
context:
space:
mode:
authorÁlvaro Fernández Rojas <noltari@gmail.com>2016-05-19 19:32:46 +0200
committerÁlvaro Fernández Rojas <noltari@gmail.com>2016-05-19 21:08:06 +0200
commitc4664b0f911614a2d19eddcb9b52e2937581ca5b (patch)
tree30eb6e0e9d8be2f37d1d54e7489aa36251f65c6d /target/linux/generic/patches-4.4/271-uapi-libc-compat.h-do-not-rely-on-__GLIBC__.patch
parentd354bfde174514973309e788e11c286f1667c2f5 (diff)
downloadmtk-20170518-c4664b0f911614a2d19eddcb9b52e2937581ca5b.zip
mtk-20170518-c4664b0f911614a2d19eddcb9b52e2937581ca5b.tar.gz
mtk-20170518-c4664b0f911614a2d19eddcb9b52e2937581ca5b.tar.bz2
kernel: update kernel 4.4 to version 4.4.11
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/generic/patches-4.4/271-uapi-libc-compat.h-do-not-rely-on-__GLIBC__.patch')
-rw-r--r--target/linux/generic/patches-4.4/271-uapi-libc-compat.h-do-not-rely-on-__GLIBC__.patch27
1 files changed, 20 insertions, 7 deletions
diff --git a/target/linux/generic/patches-4.4/271-uapi-libc-compat.h-do-not-rely-on-__GLIBC__.patch b/target/linux/generic/patches-4.4/271-uapi-libc-compat.h-do-not-rely-on-__GLIBC__.patch
index 61d3873..b8e6a3a 100644
--- a/target/linux/generic/patches-4.4/271-uapi-libc-compat.h-do-not-rely-on-__GLIBC__.patch
+++ b/target/linux/generic/patches-4.4/271-uapi-libc-compat.h-do-not-rely-on-__GLIBC__.patch
@@ -26,6 +26,19 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
+/* We have included libc headers... */
+#if !defined(__KERNEL__)
+-/* Coordinate with glibc net/if.h header. */
++/* Coordinate with libc net/if.h header. */
+ #if defined(_NET_IF_H)
+
+-/* GLIBC headers included first so don't define anything
++/* LIBC headers included first so don't define anything
+ * that would already be defined. */
+
+ #define __UAPI_DEF_IF_IFCONF 0
+@@ -85,10 +85,10 @@
+
+ #endif /* _NET_IF_H */
+
-/* Coordinate with glibc netinet/in.h header. */
+/* Coordinate with libc netinet/in.h header. */
#if defined(_NETINET_IN_H)
@@ -35,7 +48,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
* that would already be defined. */
#define __UAPI_DEF_IN_ADDR 0
#define __UAPI_DEF_IN_IPPROTO 0
-@@ -68,7 +68,7 @@
+@@ -102,7 +102,7 @@
* 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. */
@@ -44,7 +57,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
#define __UAPI_DEF_IN6_ADDR_ALT 0
#else
#define __UAPI_DEF_IN6_ADDR_ALT 1
-@@ -83,7 +83,7 @@
+@@ -117,7 +117,7 @@
#else
/* Linux headers included first, and we must define everything
@@ -53,7 +66,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
* __UAPI_DEF_* defines and adjust appropriately. */
#define __UAPI_DEF_IN_ADDR 1
#define __UAPI_DEF_IN_IPPROTO 1
-@@ -93,7 +93,7 @@
+@@ -127,7 +127,7 @@
#define __UAPI_DEF_IN_CLASS 1
#define __UAPI_DEF_IN6_ADDR 1
@@ -62,16 +75,16 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
* coordinate. */
#define __UAPI_DEF_IN6_ADDR_ALT 1
#define __UAPI_DEF_SOCKADDR_IN6 1
-@@ -115,7 +115,7 @@
+@@ -149,7 +149,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 in.h */
- #define __UAPI_DEF_IN_ADDR 1
-@@ -138,6 +138,6 @@
+ /* Definitions for if.h */
+ #define __UAPI_DEF_IF_IFCONF 1
+@@ -182,6 +182,6 @@
/* Definitions for xattr.h */
#define __UAPI_DEF_XATTR 1