diff options
| author | John Spencer <maillist-busybox@barfooze.de> | 2014-01-27 23:20:01 +0100 |
|---|---|---|
| committer | Richard Dale <richard.dale@codethink.co.uk> | 2015-06-19 16:28:49 +0000 |
| commit | 4f3cd7769e5006319e5b3b7ceedf47e00f35fe4e (patch) | |
| tree | 92f20c7482bf41fe5628b844e5529432bda8b709 | |
| parent | 91b0c141c6b1ef78d94e567296c968e0dac2d395 (diff) | |
| download | busybox-baserock/1.23.2-openwrt.tar.gz | |
ifplugd: move linux header inclusion after userspace headersbaserock/1.23.2-openwrt
this allows linux' new libc-compat.h to kick in, which prevents
redefinition of some structs that both userspace and kernel
headers define. without this patch, struct ethhdr gets redefined
and breaks the build against musl libc.
Signed-Off-By: John Spencer <maillist-busybox@barfooze.de>
| -rw-r--r-- | networking/ifplugd.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/networking/ifplugd.c b/networking/ifplugd.c index fef7a5ac9..796aa22da 100644 --- a/networking/ifplugd.c +++ b/networking/ifplugd.c @@ -34,16 +34,17 @@ #include "libbb.h" #include "fix_u32.h" -#include <linux/if.h> -#include <linux/mii.h> -#include <linux/ethtool.h> #ifdef HAVE_NET_ETHERNET_H # include <net/ethernet.h> #endif +#include <syslog.h> + +#include <linux/if.h> +#include <linux/mii.h> +#include <linux/ethtool.h> #include <linux/netlink.h> #include <linux/rtnetlink.h> #include <linux/sockios.h> -#include <syslog.h> #define __user #include <linux/wireless.h> |