summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pimd/pim_iface.c4
-rw-r--r--pimd/pim_igmp.c1
-rw-r--r--pimd/pim_signals.c1
-rw-r--r--pimd/pim_sock.c3
-rw-r--r--pimd/pimd.c1
5 files changed, 7 insertions, 3 deletions
diff --git a/pimd/pim_iface.c b/pimd/pim_iface.c
index 8357a26a3e..87c25c0dbd 100644
--- a/pimd/pim_iface.c
+++ b/pimd/pim_iface.c
@@ -607,9 +607,9 @@ struct in_addr pim_find_primary_addr(struct interface *ifp)
return find_first_nonsec_addr(ifp);
}
-static pim_iface_vif_index = 0;
+static int pim_iface_vif_index = 0;
-int
+static int
pim_iface_next_vif_index (struct interface *ifp)
{
/*
diff --git a/pimd/pim_igmp.c b/pimd/pim_igmp.c
index 2b9bb0fdeb..b16f4e2e35 100644
--- a/pimd/pim_igmp.c
+++ b/pimd/pim_igmp.c
@@ -23,6 +23,7 @@
#include <zebra.h>
#include "memory.h"
+#include "if.h"
#include "pimd.h"
#include "pim_igmp.h"
diff --git a/pimd/pim_signals.c b/pimd/pim_signals.c
index 35493311f9..d014b187aa 100644
--- a/pimd/pim_signals.c
+++ b/pimd/pim_signals.c
@@ -27,6 +27,7 @@
#include "sigevent.h"
#include "memory.h"
#include "log.h"
+#include "if.h"
#include "pim_signals.h"
#include "pimd.h"
diff --git a/pimd/pim_sock.c b/pimd/pim_sock.c
index 2bb48f75a5..278a0972f8 100644
--- a/pimd/pim_sock.c
+++ b/pimd/pim_sock.c
@@ -21,7 +21,6 @@
*/
#include <zebra.h>
-#include "pim_mroute.h"
#include <sys/types.h>
#include <sys/socket.h>
@@ -34,8 +33,10 @@
#include "log.h"
#include "privs.h"
+#include "if.h"
#include "pimd.h"
+#include "pim_mroute.h"
#include "pim_sock.h"
#include "pim_str.h"
#include "pim_igmp_join.h"
diff --git a/pimd/pimd.c b/pimd/pimd.c
index 868a2fca26..5b6824da58 100644
--- a/pimd/pimd.c
+++ b/pimd/pimd.c
@@ -24,6 +24,7 @@
#include "log.h"
#include "memory.h"
+#include "if.h"
#include "pimd.h"
#include "pim_cmd.h"