changeset 4585:745c62847a59 draft

Fix compile on NetBSD with ARP but not ARPING
author Roy Marples <roy@marples.name>
date Thu, 25 Jul 2019 00:06:36 +0100
parents 978e3fbbec6c
children e2824507fda0
files src/dhcp.c
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/dhcp.c	Wed Jul 24 20:16:27 2019 +0100
+++ b/src/dhcp.c	Thu Jul 25 00:06:36 2019 +0100
@@ -127,7 +127,7 @@
 
 static int dhcp_openbpf(struct interface *);
 static void dhcp_start1(void *);
-#ifdef ARP
+#if defined(ARP) && (!defined(KERNEL_RFC5227) || defined(ARPING))
 static void dhcp_arp_found(struct arp_state *, const struct arp_msg *);
 #endif
 static void dhcp_handledhcp(struct interface *, struct bootp *, size_t,
@@ -2029,7 +2029,7 @@
 }
 #endif
 
-#ifdef ARP
+#if defined(ARP) && (!defined(KERNEL_RFC5227) || defined(ARPING))
 static void
 dhcp_arp_not_found(struct arp_state *astate)
 {
@@ -2309,6 +2309,7 @@
 }
 #endif
 
+#if !defined(KERNEL_RFC5227) || defined(ARPING)
 static struct arp_state *
 dhcp_arp_new(struct interface *ifp, struct in_addr *addr)
 {
@@ -2327,6 +2328,7 @@
 #endif
 	return astate;
 }
+#endif
 
 static int
 dhcp_arp_address(struct interface *ifp)