diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2015-10-05 11:15:43 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2015-10-05 11:15:43 +0200 |
| commit | 5fa6d1a632505789409a2ba6cf8e112529f9db18 (patch) | |
| tree | 9666bad5a3b4ebd4c9dfabbe5b0f67617e075c00 /networking/ifplugd.c | |
| parent | 12efcf3285a75d197704d2eef23824b3e4f11e66 (diff) | |
| download | busybox-5fa6d1a632505789409a2ba6cf8e112529f9db18.tar.gz | |
Aboriginal linux/musl build fixes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking/ifplugd.c')
| -rw-r--r-- | networking/ifplugd.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/networking/ifplugd.c b/networking/ifplugd.c index fef7a5ac9..1e6c562e0 100644 --- a/networking/ifplugd.c +++ b/networking/ifplugd.c @@ -38,7 +38,17 @@ #include <linux/mii.h> #include <linux/ethtool.h> #ifdef HAVE_NET_ETHERNET_H -# include <net/ethernet.h> +/* musl breakage: + * In file included from /usr/include/net/ethernet.h:10, + * from networking/ifplugd.c:41: + * /usr/include/netinet/if_ether.h:96: error: redefinition of 'struct ethhdr' + * + * Build succeeds without it on musl. Commented it out. + * If on your system you need it, consider removing <linux/ethtool.h> + * and copy-pasting its definitions here (<linux/ethtool.h> is what pulls in + * conflicting definition of struct ethhdr on musl). + */ +/* # include <net/ethernet.h> */ #endif #include <linux/netlink.h> #include <linux/rtnetlink.h> |