diff options
Diffstat (limited to 'bgpd/bgp_ecommunity.h')
| -rw-r--r-- | bgpd/bgp_ecommunity.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/bgpd/bgp_ecommunity.h b/bgpd/bgp_ecommunity.h index 0d1eb585..278721c8 100644 --- a/bgpd/bgp_ecommunity.h +++ b/bgpd/bgp_ecommunity.h @@ -72,11 +72,7 @@ extern struct ecommunity *ecommunity_parse (u_int8_t *, u_short); extern struct ecommunity *ecommunity_dup (struct ecommunity *); extern struct ecommunity *ecommunity_merge (struct ecommunity *, struct ecommunity *); extern struct ecommunity *ecommunity_intern (struct ecommunity *); -<<<<<<< HEAD:bgpd/bgp_ecommunity.h -extern int ecommunity_cmp (void *, void *); -======= extern int ecommunity_cmp (const void *, const void *); ->>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:bgpd/bgp_ecommunity.h extern void ecommunity_unintern (struct ecommunity *); extern unsigned int ecommunity_hash_make (void *); extern struct ecommunity *ecommunity_str2com (const char *, int, int); |