X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/585ac3db0663f474fd3417ea91953b58022cc9d9..c91ffeae22ab1c7d6714f0935a51030d088a5f5c:/tcpdump-stdinc.h diff --git a/tcpdump-stdinc.h b/tcpdump-stdinc.h index dde6c507..d971341c 100644 --- a/tcpdump-stdinc.h +++ b/tcpdump-stdinc.h @@ -57,9 +57,6 @@ #endif #if !defined(__MINGW32__) && !defined(__WATCOMC__) -#undef toascii -#define isascii __isascii -#define toascii __toascii #define stat _stat #define open _open #define fstat _fstat @@ -90,10 +87,6 @@ extern int inet_aton (const char *cp, struct in_addr *addr); #define INET6_ADDRSTRLEN 46 #endif -#ifndef toascii -#define toascii(c) ((c) & 0x7f) -#endif - #ifndef caddr_t typedef char* caddr_t; #endif /* caddr_t */ @@ -275,4 +268,11 @@ typedef char* caddr_t; * end of Apple deprecation workaround macros */ +#ifndef min +#define min(a,b) ((a)>(b)?(b):(a)) +#endif +#ifndef max +#define max(a,b) ((b)>(a)?(b):(a)) +#endif + #endif /* tcpdump_stdinc_h */