From: Roy Marples <roy@marples.name>
Date: Thu, 14 Nov 2013 15:48:07 +0000 (+0000)
Subject: Build fixes for only INET and only INET6
X-Git-Tag: v6.2.0~52
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=32aaa4c96365d6fdea891ea59f35e4893d153e16;p=thirdparty%2Fdhcpcd.git

Build fixes for only INET and only INET6
---

diff --git a/ipv4.h b/ipv4.h
index ebab2cd3..bf85294b 100644
--- a/ipv4.h
+++ b/ipv4.h
@@ -97,9 +97,11 @@ ssize_t ipv4_sendrawpacket(const struct interface *,
 ssize_t ipv4_getrawpacket(struct interface *, int, void *, ssize_t, int *);
 void ipv4_free(struct interface *);
 #else
-#define ipv4_init() -1
+#define ipv4_init() (-1)
 #define ipv4_applyaddr(a) {}
 #define ipv4_freeroutes(a) {}
+#define ipv4_free(a) {}
+#define ipv4_addrexists(a) (0)
 #endif
 
 #endif
diff --git a/net.c b/net.c
index 2b7e6120..390fff9f 100644
--- a/net.c
+++ b/net.c
@@ -230,6 +230,7 @@ discover_interfaces(int argc, char * const *argv)
 	const struct sockaddr_in *addr;
 	const struct sockaddr_in *net;
 	const struct sockaddr_in *dst;
+#endif
 #ifdef INET6
 	const struct sockaddr_in6 *sin6;
 	int ifa_flags;
@@ -487,7 +488,6 @@ discover_interfaces(int argc, char * const *argv)
 #endif
 		}
 	}
-#endif
 
 	freeifaddrs(ifaddrs);