From fa5642bfc0585bfadef238b830058e4d6e07f4a4 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 4 May 2018 12:46:52 +0300 Subject: [PATCH] include: Fix musl libc compatibility MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Conflicting definitions of struct ethhdr between the kernel and musl libc provides headers causes a build failure: In file included from .../usr/include/netinet/ether.h:8:0, from useful_functions.c:28: .../usr/include/netinet/if_ether.h:107:8: error: redefinition of ‘struct ethhdr’ struct ethhdr { ^~~~~~ In file included from include/linux/netfilter_bridge.h:8:0, from include/linux/netfilter_bridge/ebtables.h:17, from include/ebtables_u.h:27, from useful_functions.c:25: include/linux/if_ether.h:119:8: note: originally defined here struct ethhdr { ^~~~~~ Recent enough versions kernel headers allow the libc to suppress conflicting kernel definitions. Include the libc proivded netinet/ether.h before kernel headers to suppress the conflicting definition of struct ethhdr. Signed-off-by: Baruch Siach Signed-off-by: Pablo Neira Ayuso Signed-off-by: Phil Sutter --- include/ebtables_u.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/ebtables_u.h b/include/ebtables_u.h index c8589969bd8e0..4824a145964ef 100644 --- a/include/ebtables_u.h +++ b/include/ebtables_u.h @@ -24,6 +24,7 @@ #ifndef EBTABLES_U_H #define EBTABLES_U_H #include +#include #include #include -- 2.21.0