From: Roy Marples <roy@marples.name>
Date: Thu, 13 Feb 2014 08:15:05 +0000 (+0000)
Subject: Fix compile without INET or INET6.
X-Git-Tag: v6.3.0~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=298c01136e8c73b410f75c2dfad996487b7f414f;p=thirdparty%2Fdhcpcd.git

Fix compile without INET or INET6.
---

diff --git a/dhcp6.h b/dhcp6.h
index a7d873cd..949154fe 100644
--- a/dhcp6.h
+++ b/dhcp6.h
@@ -240,9 +240,9 @@ void dhcp6_handleifa(struct dhcpcd_ctx *, int, const char *,
 void dhcp6_drop(struct interface *, const char *);
 #else
 #define dhcp6_printoptions()
-#define dhcp6_addrexists(a) 0
-#define dhcp6_find_delegates(a) 0
-#define dhcp6_start(a, b) 0
+#define dhcp6_addrexists(a, b) (0)
+#define dhcp6_find_delegates(a) (0)
+#define dhcp6_start(a, b) (0)
 #define dhcp6_reboot(a)
 #define dhcp6_env(a, b, c, d, e)
 #define dhcp6_free(a)
diff --git a/ipv4.h b/ipv4.h
index 1fda9ba6..7ac93448 100644
--- a/ipv4.h
+++ b/ipv4.h
@@ -98,12 +98,12 @@ ssize_t ipv4_getrawpacket(struct interface *, int, void *, ssize_t, int *);
 void ipv4_free(struct interface *);
 void ipv4_ctxfree(struct dhcpcd_ctx *);
 #else
-#define ipv4_init() (-1)
+#define ipv4_init(a) (-1)
 #define ipv4_applyaddr(a) {}
 #define ipv4_freeroutes(a) {}
 #define ipv4_free(a) {}
 #define ipv4_ctxfree(a) {}
-#define ipv4_addrexists(a) (0)
+#define ipv4_addrexists(a, b) (0)
 #endif
 
 #endif
diff --git a/ipv6.h b/ipv6.h
index b070696e..5089d644 100644
--- a/ipv6.h
+++ b/ipv6.h
@@ -201,7 +201,7 @@ int if_route6(const struct rt6 *rt, int);
 #define del_src_route6(rt) if_route6(rt, -2);
 
 #else
-#define ipv6_init() -1
+#define ipv6_init(a) NULL
 #define ipv6_free_ll_callbacks(a)
 #define ipv6_free(a)
 #define ipv6_ctxfree(a)
diff --git a/ipv6nd.h b/ipv6nd.h
index cc66f65b..31252e84 100644
--- a/ipv6nd.h
+++ b/ipv6nd.h
@@ -107,9 +107,9 @@ void ipv6nd_cancelprobeaddr(struct ipv6_addr *);
 
 #else
 #define ipv6nd_startrs(a) {}
-#define ipv6nd_addrexists(a) (0)
+#define ipv6nd_addrexists(a, b) (0)
 #define ipv6nd_free(a)
-#define ipv6nd_has_ra(a) 0
+#define ipv6nd_has_ra(a) (0)
 #define ipv6nd_drop(a)
 #endif