X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/5fa8fc69b23ca302382f07b8ab3de69072fdb68b..91afccb253a5f4d94c3a8d98a8fe24df23f10c38:/tcpdump-stdinc.h?ds=inline diff --git a/tcpdump-stdinc.h b/tcpdump-stdinc.h index 12caf777..5aba8fdc 100644 --- a/tcpdump-stdinc.h +++ b/tcpdump-stdinc.h @@ -55,6 +55,10 @@ #include #include /* in wpcap's Win32/include */ +#ifndef NBBY +#define NBBY 8 +#endif + #if !defined(__MINGW32__) && !defined(__WATCOMC__) #undef toascii #define isascii __isascii @@ -143,7 +147,7 @@ typedef char* caddr_t; #define FOPEN_WRITE_BIN FOPEN_WRITE_TXT #endif -#if defined(__GNUC__) && defined(__i386__) && !defined(__ntohl) +#if defined(__GNUC__) && defined(__i386__) && !defined(__APPLE__) && !defined(__ntohl) #undef ntohl #undef ntohs #undef htonl