| Brad Bishop | 868407c | 2019-11-04 13:24:47 -0500 | [diff] [blame^] | 1 | Subject: [PATCH] dhcpcd: Fix build error with musl. |
| 2 | |
| 3 | Re-organize the header includes in if-linux.c to fix error as follows: |
| 4 | In file included from if-linux.c:49: |
| 5 | path/usr/include/netinet/if_ether.h:112:8: error: redefinition of 'struct ethhdr' |
| 6 | |
| 7 | Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> |
| 8 | --- |
| 9 | src/if-linux.c | 2 +- |
| 10 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 11 | |
| 12 | diff --git a/src/if-linux.c b/src/if-linux.c |
| 13 | index fd47278..bfa878b 100644 |
| 14 | --- a/src/if-linux.c |
| 15 | +++ b/src/if-linux.c |
| 16 | @@ -37,6 +37,7 @@ |
| 17 | #include <linux/if_addr.h> |
| 18 | #include <linux/if_link.h> |
| 19 | #include <linux/if_packet.h> |
| 20 | +#include <netinet/if_ether.h> |
| 21 | #include <linux/if_tun.h> |
| 22 | #include <linux/if_vlan.h> |
| 23 | #include <linux/filter.h> |
| 24 | @@ -46,7 +47,6 @@ |
| 25 | |
| 26 | #include <arpa/inet.h> |
| 27 | #include <net/if.h> |
| 28 | -#include <netinet/if_ether.h> |
| 29 | #include <netinet/in_systm.h> |
| 30 | #include <netinet/in.h> |
| 31 | #include <net/route.h> |
| 32 | -- |
| 33 | 2.7.4 |
| 34 | |