List the 4.1.x fixes we've checked in so far.

[tcpdump] / tcpdump-stdinc.h

diff --git a/tcpdump-stdinc.h b/tcpdump-stdinc.h
index 12caf777975395439516c4659a39fe0514fd734b..5aba8fdcc0252d936257c964a6d6abbcca5d274b 100644 (file)
--- a/tcpdump-stdinc.h
+++ b/tcpdump-stdinc.h
@@ -55,6 +55,10 @@
 #include <sys/types.h>
 #include <net/netdb.h>  /* 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