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 <renato@opensourcerouting.org>

diff --git a/lib/command.c b/lib/command.c
index 06879f6854470bd9fbdbd1a8db4a9090af52deea..b46241ac87a54aca53adf12567120dae5dd1e1f8 100644 (file)
--- 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 547f6f3b6d9e63e4547587186f3e9ecff4ef6701..fcb333120fb81f819c314e0b652ee073c229aee4 100644 (file)
--- 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 {