proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-09 05:13:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: rename enum to avoid conflict

Browse Source 
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:
Renato Westphal 2019-02-11 16:01:32 -02:00
parent 5e2444690b
commit c139972c0f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/command.c
View File

@ -1009,7 +1009,7 @@ enum node_type node_parent(enum node_type node)
} }
/* Execute command by argument vline vector. */ /* 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, struct vty *vty,
const struct cmd_element **cmd) const struct cmd_element **cmd)
{ {

2
lib/command_match.h
View File

@ -35,7 +35,7 @@ extern "C" {
/* These definitions exist in command.c in the current engine but should be /* These definitions exist in command.c in the current engine but should be
* relocated here in the new engine * relocated here in the new engine
*/ */
enum filter_type { FILTER_RELAXED, FILTER_STRICT }; enum cmd_filter_type { FILTER_RELAXED, FILTER_STRICT };
/* matcher result value */ /* matcher result value */
enum matcher_rv { enum matcher_rv {