Fix compile errors.

diff --git a/if-linux.c b/if-linux.c
index 1353d7e6857aed81994396300e3dacd11be80363..8c5b4727542bb0784e0cf84a12ee6da8f6d80f67 100644 (file)
--- 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 c6c008e7af48d45e8e786c6ccb784ef1743aa82c..7a47833dab52dfdd5ab2f520ca79749145eeb4ae 100644 (file)
--- 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