summaryrefslogtreecommitdiffstats
path: root/lib/command.h
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@opensourcerouting.org>2016-11-11 07:23:02 +0100
committerDavid Lamparter <equinox@opensourcerouting.org>2016-11-23 08:32:30 +0100
commit34d5ef459140ee7e8ae22c220764dba54b6527cf (patch)
treeade8d724fb7f11d75981b96db40caf1032abf59f /lib/command.h
parentvtysh: initialise readline before binding key (diff)
downloadfrr-34d5ef459140ee7e8ae22c220764dba54b6527cf.tar.xz
frr-34d5ef459140ee7e8ae22c220764dba54b6527cf.zip
vtysh: fix some macro breakage
vtysh's extract.pl script doesn't cope with install_element(var, ) where "var" is not one of the FOO_NODE constants. Also, the future defun_lex tool doesn't deal well with preprocessor expansions in the same regard. This tries simplifying out some of these. lib/distribute.c needs further thinking. Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'lib/command.h')
-rw-r--r--lib/command.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/lib/command.h b/lib/command.h
index f5572f7f8..f120063ea 100644
--- a/lib/command.h
+++ b/lib/command.h
@@ -386,14 +386,9 @@ struct cmd_element
/* IPv4 only machine should not accept IPv6 address for peer's IP
address. So we replace VTY command string like below. */
-#ifdef HAVE_IPV6
#define NEIGHBOR_ADDR_STR "Neighbor address\nIPv6 address\n"
#define NEIGHBOR_ADDR_STR2 "Neighbor address\nNeighbor IPv6 address\nInterface name or neighbor tag\n"
#define NEIGHBOR_ADDR_STR3 "Neighbor address\nIPv6 address\nInterface name\n"
-#else
-#define NEIGHBOR_ADDR_STR "Neighbor address\n"
-#define NEIGHBOR_ADDR_STR2 "Neighbor address\nNeighbor tag\n"
-#endif /* HAVE_IPV6 */
/* Prototypes. */
extern void install_node (struct cmd_node *, int (*) (struct vty *));