proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-06-14 14:46:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: force local MIN/MAX macros

Browse Source 
Linux/glibc sys/param.h has definitions of MIN/MAX that result in
multiple evaluations of its parameters.  Force local definitions.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2016-09-21 18:20:49 +02:00 committed by Donald Sharp
parent 518acd6fd8
commit 6b143a68d3
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/checksum.c
View File

@ -47,7 +47,7 @@ in_cksum(void *parg, int nbytes)
}
/* Fletcher Checksum -- Refer to RFC1008. */
#define MODX 4102 /* 5802 should be fine */
#define MODX 4102U /* 5802 should be fine */
/* To be consistent, offset is 0-based index, rather than the 1-based
index required in the specification ISO 8473, Annex C.1 */

9
lib/zebra.h
View File

@ -352,18 +352,21 @@ struct in_pktinfo
#endif /* ndef BYTE_ORDER */
/* MAX / MIN are not commonly defined, but useful */
#ifndef MAX
/* note: glibc sys/param.h has #define MIN(a,b) (((a)<(b))?(a):(b)) */
#ifdef MAX
#undef MAX
#endif
#define MAX(a, b) \
({ typeof (a) _a = (a); \
typeof (b) _b = (b); \
_a > _b ? _a : _b; })
#ifdef MIN
#undef MIN
#endif
#ifndef MIN
#define MIN(a, b) \
({ typeof (a) _a = (a); \
typeof (b) _b = (b); \
_a < _b ? _a : _b; })
#endif
#define ZEBRA_NUM_OF(x) (sizeof (x) / sizeof (x[0]))