diff options
| author | Denis Ovsienko <denis@ovsienko.info> | 2020-08-24 21:53:58 +0100 |
|---|---|---|
| committer | Denis Ovsienko <denis@ovsienko.info> | 2020-08-24 21:53:58 +0100 |
| commit | 5c2027db88176ff4073d552a887429a3c9d3acee (patch) | |
| tree | 28c3d2d57d760fb007924de11d96161b82272931 /netdissect.h | |
| parent | d5bb7824e1092793a2961f0ed6f984f193ac6cbb (diff) | |
| download | tcpdump-5c2027db88176ff4073d552a887429a3c9d3acee.tar.gz | |
Rename min() and max() to ND_MIN() and ND_MAX(). [skip ci]
As discussed on tcpdump-workers, it was a place for a potential clash
with non-macros.
Diffstat (limited to 'netdissect.h')
| -rw-r--r-- | netdissect.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/netdissect.h b/netdissect.h index 546d38b0..b774ae63 100644 --- a/netdissect.h +++ b/netdissect.h @@ -288,12 +288,8 @@ extern void nd_pop_all_packet_info(netdissect_options *); #define PT_SOMEIP 19 /* Autosar SOME/IP Protocol */ #define PT_DOMAIN 20 /* Domain Name System (DNS) */ -#ifndef min -#define min(a,b) ((a)>(b)?(b):(a)) -#endif -#ifndef max -#define max(a,b) ((b)>(a)?(b):(a)) -#endif +#define ND_MIN(a,b) ((a)>(b)?(b):(a)) +#define ND_MAX(a,b) ((b)>(a)?(b):(a)) /* For source or destination ports tests (UDP, TCP, ...) */ #define IS_SRC_OR_DST_PORT(p) (sport == (p) || dport == (p)) |