Backout CHANGES update - wrong branch

[tcpdump] / tcpdump-stdinc.h

diff --git a/tcpdump-stdinc.h b/tcpdump-stdinc.h
index 4256d596f1e1e9dcd38ad73d5bc4d6f8bcfc0d84..a3079dc7b2b4702bccb9b80760cf4c9f7a804d7b 100644 (file)
--- a/tcpdump-stdinc.h
+++ b/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.5 2006-06-23 02:07:27 hannes Exp $ (LBL)
  */
 
 /*
@@ -46,15 +46,29 @@
 
 #include <stdio.h>
 #include <winsock2.h>
+#include <Ws2tcpip.h>
 #include "bittypes.h"
 #include <ctype.h>
 #include <time.h>
 #include <io.h>
-#include "IP6_misc.h"
 #include <fcntl.h>
 #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
@@ -157,4 +178,12 @@ typedef char* caddr_t;
 #define INET_ADDRSTRLEN 16
 #endif
 
+#ifndef TRUE
+#define TRUE 1
+#endif
+
+#ifndef FALSE
+#define FALSE 0
+#endif
+
 #endif /* tcpdump_stdinc_h */