From: Roy Marples <roy@marples.name>
Date: Tue, 9 Sep 2008 19:07:37 +0000 (+0000)
Subject: Fix compile errors.
X-Git-Tag: v5.0.0~271
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59795183289d077902f64a815c31126499a12ca2;p=thirdparty%2Fdhcpcd.git

Fix compile errors.
---

diff --git a/if-linux.c b/if-linux.c
index 1353d7e6..8c5b4727 100644
--- a/if-linux.c
+++ b/if-linux.c
@@ -398,7 +398,7 @@ discover_interfaces(int argc, char * const *argv)
 	char *buffer = NULL, *p;
 	size_t len = 0, ln = 0, n;
 	int i;
-	struct interface *ifaces = NULL, *ifp, *ifl;
+	struct interface *ifs = NULL, *ifp, *ifl;
 
 	if ((f = fopen("/proc/net/dev", "r"))) {
 		while (get_line(&buffer, &len, f)) {
@@ -410,7 +410,7 @@ discover_interfaces(int argc, char * const *argv)
 			n = strcspn(p, ": \t");
 			p[n]= '\0';
 			ifl = NULL;
-			for (ifp = ifaces; ifp; ifp = ifp->next) {
+			for (ifp = ifs; ifp; ifp = ifp->next) {
 				if (strcmp(ifp->name, p) == 0)
 					break;
 				ifl = ifp;
@@ -426,9 +426,9 @@ discover_interfaces(int argc, char * const *argv)
 			}
 			if ((ifp = init_interface(p))) {
 				if (ifl)
-					ifl->next =ifp; 
+					ifl->next = ifp; 
 				else
-					ifaces = ifp;
+					ifs = ifp;
 			}
 		}
 		fclose(f);
diff --git a/if-pref.c b/if-pref.c
index c6c008e7..7a47833d 100644
--- a/if-pref.c
+++ b/if-pref.c
@@ -28,6 +28,7 @@
 #include "config.h"
 #include "dhcpcd.h"
 #include "if-pref.h"
+#include "net.h"
 
 /* Interface comparer for working out ordering. */
 static int