pimd: Apparently compilers are evil

Fix up some compiler issues from clang to gcc.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/pimd/pim_iface.c b/pimd/pim_iface.c
index 8357a26a3e4bf36499bcc819d023ebf8cf48046f..87c25c0dbdd45dd1098c4198b891e54a5a221d72 100644 (file)
--- 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 2b9bb0fdeb453cfe32337cdde426eb5b33e30bb2..b16f4e2e352db9e24ef29149bb305f77c1d637b3 100644 (file)
--- 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 35493311f967eb9cbd81097db01da4348dbf4bc1..d014b187aafc5c40c24b9b5bcfaa14b8f6e19d90 100644 (file)
--- 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 2bb48f75a5bd542ef7200eef122515f92bbef6bd..278a0972f815e8f5685159d524c1f8a455aa7355 100644 (file)
--- 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 868a2fca263909500d6383ee271d7f88e248ead1..5b6824da5850cbd35c2e85de324c90e7679fd508 100644 (file)
--- 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"