From c139972c0ffcabe73cafc3d20f257163fa81ddd0 Mon Sep 17 00:00:00 2001 From: Renato Westphal Date: Mon, 11 Feb 2019 16:01:32 -0200 Subject: [PATCH] lib: rename enum to avoid conflict Two different definitions of "enum filter_type" exist in libfrr: one in lib/filter.h and other in lib/command_match.h. Rename one of them to resolve a conflict that happens when both headers are included by the same file. Signed-off-by: Renato Westphal --- lib/command.c | 2 +- lib/command_match.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/command.c b/lib/command.c index 06879f6854..b46241ac87 100644 --- a/lib/command.c +++ b/lib/command.c @@ -1009,7 +1009,7 @@ enum node_type node_parent(enum node_type node) } /* Execute command by argument vline vector. */ -static int cmd_execute_command_real(vector vline, enum filter_type filter, +static int cmd_execute_command_real(vector vline, enum cmd_filter_type filter, struct vty *vty, const struct cmd_element **cmd) { diff --git a/lib/command_match.h b/lib/command_match.h index 547f6f3b6d..fcb333120f 100644 --- a/lib/command_match.h +++ b/lib/command_match.h @@ -35,7 +35,7 @@ extern "C" { /* These definitions exist in command.c in the current engine but should be * relocated here in the new engine */ -enum filter_type { FILTER_RELAXED, FILTER_STRICT }; +enum cmd_filter_type { FILTER_RELAXED, FILTER_STRICT }; /* matcher result value */ enum matcher_rv { -- 2.39.5