0004-include-remove-libc5-support-code.patch 1.4 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051
  1. From 401673e9d37ea1e6da0bc335b1d7a2bbf445c690 Mon Sep 17 00:00:00 2001
  2. From: Felix Janda <felix.janda@posteo.de>
  3. Date: Sat, 2 May 2015 21:51:38 +0200
  4. Subject: [PATCH 2/3] include: remove libc5 support code
  5. Current code makes the assumption that !defined(__GLIBC__) means libc5
  6. which is very unlikely the case nowadays.
  7. Fixes compile error because of conflict between kernel and musl headers.
  8. Backported from :
  9. http://git.netfilter.org/iptables/commit/?id=0bb1859e2d6dd79a0a59c3ee65f6a78cba118b86
  10. Upstream-Status: backport
  11. Signed-off-by: Florian Westphal <fw@strlen.de>
  12. Signed-off-by: Brendan Heading <brendanheading@gmail.com>
  13. ---
  14. include/libiptc/ipt_kernel_headers.h | 12 ------------
  15. 1 file changed, 12 deletions(-)
  16. diff --git a/include/libiptc/ipt_kernel_headers.h b/include/libiptc/ipt_kernel_headers.h
  17. index 18861fe..a5963e9 100644
  18. --- a/include/libiptc/ipt_kernel_headers.h
  19. +++ b/include/libiptc/ipt_kernel_headers.h
  20. @@ -5,7 +5,6 @@
  21. #include <limits.h>
  22. -#if defined(__GLIBC__) && __GLIBC__ == 2
  23. #include <netinet/ip.h>
  24. #include <netinet/in.h>
  25. #include <netinet/ip_icmp.h>
  26. @@ -13,15 +12,4 @@
  27. #include <netinet/udp.h>
  28. #include <net/if.h>
  29. #include <sys/types.h>
  30. -#else /* libc5 */
  31. -#include <sys/socket.h>
  32. -#include <linux/ip.h>
  33. -#include <linux/in.h>
  34. -#include <linux/if.h>
  35. -#include <linux/icmp.h>
  36. -#include <linux/tcp.h>
  37. -#include <linux/udp.h>
  38. -#include <linux/types.h>
  39. -#include <linux/in6.h>
  40. -#endif
  41. #endif
  42. --
  43. 2.4.3