diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2008-06-09 11:48:03 +0100 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-06-09 11:48:03 +0100 |
| commit | e8362c6b85efcca6eef045f27da5ce9f7996be7b (patch) | |
| tree | ed89134f6ada9273c0e912c39371eb87d91cee6e /2.6.25 | |
| parent | set HZ to 1024 by default (diff) | |
| download | linux-headers-patches-e8362c6b85efcca6eef045f27da5ce9f7996be7b.tar.gz linux-headers-patches-e8362c6b85efcca6eef045f27da5ce9f7996be7b.tar.bz2 linux-headers-patches-e8362c6b85efcca6eef045f27da5ce9f7996be7b.zip | |
remove s6_addr* defines to stop clobbering glibc #225505
Diffstat (limited to '2.6.25')
| -rw-r--r-- | 2.6.25/07_all_pull-libc-headers-linux.patch | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/2.6.25/07_all_pull-libc-headers-linux.patch b/2.6.25/07_all_pull-libc-headers-linux.patch index a714bf7..0849dcf 100644 --- a/2.6.25/07_all_pull-libc-headers-linux.patch +++ b/2.6.25/07_all_pull-libc-headers-linux.patch @@ -147,9 +147,19 @@ completely. this seems to give a proper clean userspace experience. { union { +@@ -35,9 +37,6 @@ struct in6_addr + __be16 u6_addr16[8]; + __be32 u6_addr32[4]; + } in6_u; +-#define s6_addr in6_u.u6_addr8 +-#define s6_addr16 in6_u.u6_addr16 +-#define s6_addr32 in6_u.u6_addr32 + }; + + /* IPv6 Wildcard Address (::) and Loopback Address (::1) defined in RFC2553 @@ -57,7 +59,7 @@ extern const struct in6_addr in6addr_linklocal_allrouters; - { { { 0xff,2,0,0,0,0,0,0,0,0,0,0,0,0,0,2 } } } - #endif + extern const struct in6_addr in6addr_loopback; + #define IN6ADDR_LOOPBACK_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } } -struct sockaddr_in6 { +struct kernel_sockaddr_in6 { |