diff options
| author | sam <sam@FreeBSD.org> | 2005-07-11 03:54:22 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2005-07-11 03:54:22 +0000 |
| commit | 1166f90fe87cef69f7923a1b8c386eecdc6cb92b (patch) | |
| tree | 87e350d89f0c352cd41839a49086d78bf700350e /contrib/tcpdump/tcpdump-stdinc.h | |
| parent | a6836add6eafd2d06f4eeb7200e8217ba3399c1b (diff) | |
| download | FreeBSD-src-1166f90fe87cef69f7923a1b8c386eecdc6cb92b.zip FreeBSD-src-1166f90fe87cef69f7923a1b8c386eecdc6cb92b.tar.gz | |
Virgin import of tcpdump v3.9.1 (release) from tcpdump.org
Approved by: re (scottl)
Diffstat (limited to 'contrib/tcpdump/tcpdump-stdinc.h')
| -rw-r--r-- | contrib/tcpdump/tcpdump-stdinc.h | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/contrib/tcpdump/tcpdump-stdinc.h b/contrib/tcpdump/tcpdump-stdinc.h index 0f3ae99..dbabeef 100644 --- a/contrib/tcpdump/tcpdump-stdinc.h +++ b/contrib/tcpdump/tcpdump-stdinc.h @@ -29,7 +29,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * - * @(#) $Header: /tcpdump/master/tcpdump/tcpdump-stdinc.h,v 1.12 2005/03/27 01:35:45 guy Exp $ (LBL) + * @(#) $Header: /tcpdump/master/tcpdump/tcpdump-stdinc.h,v 1.12.2.3 2005/05/04 19:20:20 risso Exp $ (LBL) */ /* @@ -55,6 +55,20 @@ #include <sys/types.h> #include <net/netdb.h> /* in wpcap's Win32/include */ +#if !defined(__MINGW32__) && !defined(__WATCOMC__) +#undef toascii +#define isascii __isascii +#define toascii __toascii +#define stat _stat +#define open _open +#define fstat _fstat +#define read _read +#define close _close +#define O_RDONLY _O_RDONLY + +typedef short ino_t; +#endif /* __MINGW32__ */ + #ifdef __MINGW32__ #include <stdint.h> #endif @@ -89,8 +103,15 @@ typedef char* caddr_t; #include <ctype.h> #include <unistd.h> #include <netdb.h> -#ifdef INTTYPES_H_DEFINES_FORMATS +#if HAVE_INTTYPES_H #include <inttypes.h> +#else +#if HAVE_STDINT_H +#include <stdint.h> +#endif +#endif +#ifdef HAVE_SYS_BITYPES_H +#include <sys/bitypes.h> #endif #include <sys/param.h> #include <sys/types.h> /* concession to AIX */ @@ -122,7 +143,7 @@ typedef char* caddr_t; #define FOPEN_WRITE_BIN FOPEN_WRITE_TXT #endif -#if defined(__GNUC__) && defined(__i386__) +#if defined(__GNUC__) && defined(__i386__) && !defined(__ntohl) #undef ntohl #undef ntohs #undef htonl |
