diff options
| author | Donald Sharp <sharpd@nvidia.com> | 2021-11-11 09:39:52 -0500 |
|---|---|---|
| committer | Donald Sharp <sharpd@nvidia.com> | 2021-11-11 09:39:52 -0500 |
| commit | 7a8ce9d56dec3844031563c3c55bed8eb3b692d5 (patch) | |
| tree | 540ad9555825587c56143bcfc1d1172e4977a00c /bgpd/bgp_aspath.c | |
| parent | 7347a4859d4b984cea0aef769a16622d3f02e44f (diff) | |
*: use compiler.h MIN/MAX macros instead of everyone having one
We had various forms of min/max macros across multiple daemons
all of which duplicated what we have in compiler.h. Convert
everyone to use the `correct` ones
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Diffstat (limited to 'bgpd/bgp_aspath.c')
| -rw-r--r-- | bgpd/bgp_aspath.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/bgpd/bgp_aspath.c b/bgpd/bgp_aspath.c index 3c67017dc7..d3424b2957 100644 --- a/bgpd/bgp_aspath.c +++ b/bgpd/bgp_aspath.c @@ -1002,8 +1002,6 @@ uint8_t *aspath_snmp_pathseg(struct aspath *as, size_t *varlen) return stream_pnt(snmp_stream); } -#define min(A,B) ((A) < (B) ? (A) : (B)) - static struct assegment *aspath_aggregate_as_set_add(struct aspath *aspath, struct assegment *asset, as_t as) @@ -1060,7 +1058,7 @@ struct aspath *aspath_aggregate(struct aspath *as1, struct aspath *as2) break; /* Minimum segment length. */ - minlen = min(seg1->length, seg2->length); + minlen = MIN(seg1->length, seg2->length); for (match = 0; match < minlen; match++) if (seg1->as[match] != seg2->as[match]) |