diff options
| author | sam <sam@FreeBSD.org> | 2005-07-11 04:14:02 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2005-07-11 04:14:02 +0000 |
| commit | 5d66575dd923625f5f8a569b19801db44c111619 (patch) | |
| tree | 14f508983141729f86ce893b1f31e0d11cf1b4db /contrib/tcpdump/tcpdump-stdinc.h | |
| parent | fb0e3fc91b71a7c77c12753c471331fc4757d33c (diff) | |
| download | FreeBSD-src-5d66575dd923625f5f8a569b19801db44c111619.zip FreeBSD-src-5d66575dd923625f5f8a569b19801db44c111619.tar.gz | |
resolve merge conflicts
Approved by: re (scottl)
Diffstat (limited to 'contrib/tcpdump/tcpdump-stdinc.h')
| -rw-r--r-- | contrib/tcpdump/tcpdump-stdinc.h | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/contrib/tcpdump/tcpdump-stdinc.h b/contrib/tcpdump/tcpdump-stdinc.h index 8655bc9..6591183 100644 --- a/contrib/tcpdump/tcpdump-stdinc.h +++ b/contrib/tcpdump/tcpdump-stdinc.h @@ -57,6 +57,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 @@ -91,8 +105,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 */ |
