From d3f604f0d682686cc083233981886daeeeea63c1 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Thu, 14 May 2020 09:56:37 -0400 Subject: [PATCH] zebra: allow rtadv.c to compile with `--enable-rtadv=no` The rtadv.c code was not properly compiling if you turned off router advertisements in zebra. Signed-off-by: Donald Sharp --- zebra/rtadv.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/zebra/rtadv.c b/zebra/rtadv.c index 013eb5819c..4036499605 100644 --- a/zebra/rtadv.c +++ b/zebra/rtadv.c @@ -46,14 +46,14 @@ #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.*/; }