diff options
author | Joachim Nilsson <troglobit@gmail.com> | 2012-05-09 13:38:36 +0200 |
---|---|---|
committer | David Lamparter <equinox@diac24.net> | 2012-05-09 13:51:54 +0200 |
commit | 36735ed988f96810e78d0ace2f7d8e6397db5c50 (patch) | |
tree | 3a8f876383d07a33aa7b76d7519a75d8678bbb1f /zebra/rtadv.h | |
parent | 42cb6b6655d0cc141374ec373220d244f81fbba0 (diff) |
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 <troglobit@gmail.com>
[moved #ifdef RTADV to rtadv.h]
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'zebra/rtadv.h')
-rw-r--r-- | zebra/rtadv.h | 5 |
1 files changed, 5 insertions, 0 deletions
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 */ |