From 401673e9d37ea1e6da0bc335b1d7a2bbf445c690 Mon Sep 17 00:00:00 2001 From: Felix Janda Date: Sat, 2 May 2015 21:51:38 +0200 Subject: [PATCH 2/3] include: remove libc5 support code Current code makes the assumption that !defined(__GLIBC__) means libc5 which is very unlikely the case nowadays. Fixes compile error because of conflict between kernel and musl headers. Backported from : http://git.netfilter.org/iptables/commit/?id=0bb1859e2d6dd79a0a59c3ee65f6a78cba118b86 Upstream-Status: backport Signed-off-by: Florian Westphal Signed-off-by: Brendan Heading --- include/libiptc/ipt_kernel_headers.h | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/include/libiptc/ipt_kernel_headers.h b/include/libiptc/ipt_kernel_headers.h index 18861fe..a5963e9 100644 --- a/include/libiptc/ipt_kernel_headers.h +++ b/include/libiptc/ipt_kernel_headers.h @@ -5,7 +5,6 @@ #include -#if defined(__GLIBC__) && __GLIBC__ == 2 #include #include #include @@ -13,15 +12,4 @@ #include #include #include -#else /* libc5 */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#endif #endif -- 2.4.3