radvd/radvd-2.14-headers_conflict.patch

14 lines
402 B
Diff

diff --git a/includes.h b/includes.h
index d2449c4..08ae63d 100644
--- a/includes.h
+++ b/includes.h
@@ -86,7 +86,7 @@
#include <net/if_types.h>
#endif
-#if defined(HAVE_NET_IF_ARP_H) && !defined(ARPHRD_ETHER)
+#if defined(HAVE_NET_IF_ARP_H) && !defined(ARPHRD_ETHER) && !defined(HAVE_LINUX_IF_ARP_H)
#include <net/if_arp.h>
#endif /* defined(HAVE_NET_IF_ARP_H) && !defined(ARPHRD_ETHER) */