mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-04 00:59:13 +00:00
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>
This commit is contained in:
parent
5e2444690b
commit
c139972c0f
@ -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)
|
||||
{
|
||||
|
@ -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 {
|
||||
|
Loading…
Reference in New Issue
Block a user