Merge branch 'cmaster-next' into vtysh-grammar

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

Conflicts:
	lib/.gitignore
	lib/command.c
	lib/command.h

1 files changed, 5 insertions, 4 deletions

diff --git a/pimd/test_igmpv3_join.c b/pimd/test_igmpv3_join.c
index 6f1e34de88..5c4574024b 100644
--- a/pimd/test_igmpv3_join.c
+++ b/pimd/test_igmpv3_join.c
@@ -20,6 +20,8 @@
   $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
+#include <zebra.h>
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
@@ -30,16 +32,15 @@
 #include <net/if.h>
 #include <arpa/inet.h>
 
-#include "thread.h"
+#include "if.h"
 #include "pim_igmp_join.h"
 
-struct thread_master *master;
 const char *prog_name = 0;
 
 static int iface_solve_index(const char *ifname)
 {
   struct if_nameindex *ini;
-  int ifindex = -1;
+  ifindex_t ifindex = -1;
   int i;
 
   if (!ifname)
@@ -79,7 +80,7 @@ int main(int argc, const char *argv[])
   const char *ifname;
   const char *group;
   const char *source;
-  int ifindex;
+  ifindex_t ifindex;
   int result;
   int fd;