From 36735ed988f96810e78d0ace2f7d8e6397db5c50 Mon Sep 17 00:00:00 2001 From: Joachim Nilsson Date: Wed, 9 May 2012 13:38:36 +0200 Subject: zebra: fix up compilation without rtadv/IPv6 let's ground the rtadv.h file if route advertisements are disabled. And fix up the CLI for it, as well as move the "show ip mroute" to its proper place. * zebra/rtadv.h: #ifdef RTADV * zebra/main.c: #ifdef RTADV * zebra/zebra_vty.c: move "show ip mroute" out of #ifdef IPV6 From: Joachim Nilsson [moved #ifdef RTADV to rtadv.h] Signed-off-by: David Lamparter --- zebra/rtadv.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'zebra/rtadv.h') diff --git a/zebra/rtadv.h b/zebra/rtadv.h index 564a4c66..8cb933e0 100644 --- a/zebra/rtadv.h +++ b/zebra/rtadv.h @@ -26,6 +26,9 @@ #include "vty.h" #include "zebra/interface.h" +/* NB: RTADV is defined in zebra/interface.h above */ +#ifdef RTADV + /* Router advertisement prefix. */ struct rtadv_prefix { @@ -96,4 +99,6 @@ struct nd_opt_homeagent_info { /* Home Agent info */ extern const char *rtadv_pref_strs[]; +#endif /* RTADV */ + #endif /* _ZEBRA_RTADV_H */ -- cgit v1.2.1