From 7fe96307ee288bd28a54ba4ddfa559a1cf07bb7f Mon Sep 17 00:00:00 2001 From: "F. Aragon" Date: Thu, 13 Sep 2018 17:37:08 +0200 Subject: bgpd lib ospf6d pbrd tests zebra: shadowing fixes This fixes all remaining local variable shadowing cases Signed-off-by: F. Aragon --- lib/zebra.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/zebra.h') diff --git a/lib/zebra.h b/lib/zebra.h index d80aa06935..4e0e408ea6 100644 --- a/lib/zebra.h +++ b/lib/zebra.h @@ -333,18 +333,18 @@ struct in_pktinfo { #endif #define MAX(a, b) \ ({ \ - typeof(a) _a = (a); \ - typeof(b) _b = (b); \ - _a > _b ? _a : _b; \ + typeof(a) _max_a = (a); \ + typeof(b) _max_b = (b); \ + _max_a > _max_b ? _max_a : _max_b; \ }) #ifdef MIN #undef MIN #endif #define MIN(a, b) \ ({ \ - typeof(a) _a = (a); \ - typeof(b) _b = (b); \ - _a < _b ? _a : _b; \ + typeof(a) _min_a = (a); \ + typeof(b) _min_b = (b); \ + _min_a < _min_b ? _min_a : _min_b; \ }) #ifndef offsetof -- cgit v1.2.3