]> git.puffer.fish Git - mirror/frr.git/commitdiff
zebra: allow rtadv.c to compile with `--enable-rtadv=no`
authorDonald Sharp <sharpd@cumulusnetworks.com>
Thu, 14 May 2020 13:56:37 +0000 (09:56 -0400)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Thu, 21 May 2020 11:41:07 +0000 (07:41 -0400)
The rtadv.c code was not properly compiling if you turned
off router advertisements in zebra.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
zebra/rtadv.c

index 013eb5819cc18dea4133c2cb9cda7162a8912df3..403649960552b36fbd5d28f98f72689a656fedf6 100644 (file)
 #include "zebra/zebra_errors.h"
 #include "zebra/zebra_router.h"
 
-#ifndef VTYSH_EXTRACT_PL
-#include "zebra/rtadv_clippy.c"
-#endif
-
 extern struct zebra_privs_t zserv_privs;
 
 #if defined(HAVE_RTADV)
 
+#ifndef VTYSH_EXTRACT_PL
+#include "zebra/rtadv_clippy.c"
+#endif
+
 DEFINE_MTYPE_STATIC(ZEBRA, RTADV_PREFIX, "Router Advertisement Prefix")
 
 #ifdef OPEN_BSD
@@ -2648,7 +2648,7 @@ void rtadv_init(struct zebra_vrf *zvrf)
 {
        /* Empty.*/;
 }
-void rtadv_terminate(struct zebra_vrf *zvrf)
+void rtadv_terminate(void)
 {
        /* Empty.*/;
 }