From: Francois-Xavier Le Bail Date: Sat, 20 Jan 2018 15:43:48 +0000 (+0100) Subject: Remove min() and max() macros from netdissect-stdinc.h X-Git-Tag: tcpdump-4.99-bp~1447 X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/5b45260126cdb3835a32ae3c7b7363a7a13754b4 Remove min() and max() macros from netdissect-stdinc.h They are already defined in netdissect.h. --- diff --git a/netdissect-stdinc.h b/netdissect-stdinc.h index c6e1c2c8..c7c53db4 100644 --- a/netdissect-stdinc.h +++ b/netdissect-stdinc.h @@ -477,13 +477,6 @@ struct in6_addr { */ #include "funcattrs.h" -#ifndef min -#define min(a,b) ((a)>(b)?(b):(a)) -#endif -#ifndef max -#define max(a,b) ((b)>(a)?(b):(a)) -#endif - #ifdef __ATTRIBUTE___FALLTHROUGH_OK # define ND_FALL_THROUGH __attribute__ ((fallthrough)) #else