Revert partially the commit 21b1273

[tcpdump] / netdissect.h

diff --git a/netdissect.h b/netdissect.h
index 546d38b056a98218737dd85899c8e6bb655c152c..b774ae63ef01ea6bc48b4be3d9bdb1903d9e42d5 100644 (file)
--- 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))