Rename our getopt.h to getopt_long.h.

[tcpdump] / tcpdump-stdinc.h

diff --git a/tcpdump-stdinc.h b/tcpdump-stdinc.h
index 0a94bb59ccaab89005d537855c605e33e12a182f..9a068e64826c779c9d49e139503cf0b095583766 100644 (file)
--- a/tcpdump-stdinc.h
+++ b/tcpdump-stdinc.h
@@ -31,8 +31,8 @@
 
 /*
  * Include the appropriate OS header files on Windows and various flavors
- * of UNIX, and also define some additional items and include various
- * non-OS header files on Windows, and; this isolates most of the platform
+ * of UNIX, include various non-OS header files on Windows, and define
+ * various items as needed, to isolate most of tcpdump's platform
  * differences to this one file.
  */
 
@@ -44,7 +44,6 @@
 #include <stdio.h>
 #include <winsock2.h>
 #include <Ws2tcpip.h>
-#include "bittypes.h"
 #include <ctype.h>
 #include <time.h>
 #include <io.h>
@@ -56,6 +55,84 @@
 #define NBBY   8
 #endif
 
+#ifndef uint8_t
+#define uint8_t                unsigned char
+#endif
+
+#ifndef int8_t
+#define int8_t         signed char
+#endif
+
+#ifndef uint16_t
+#define uint16_t       unsigned short
+#endif
+
+#ifndef int16_t
+#define int16_t                signed short
+#endif
+
+#ifndef uint32_t
+#define uint32_t       unsigned int
+#endif
+
+#ifndef int32_t
+#define int32_t                signed int
+#endif
+
+#ifdef _MSC_EXTENSIONS
+
+#ifndef uint64_t
+#define uint64_t       unsigned _int64
+#endif
+
+#ifndef int64_t
+#define int64_t                _int64
+#endif
+
+#ifndef PRId64
+#define PRId64         "I64d"
+#endif
+
+#ifndef PRIo64
+#define PRIo64         "I64o"
+#endif
+
+#ifndef PRIu64
+#define PRIu64         "I64u"
+#endif
+
+#ifndef PRIx64
+#define PRIx64         "I64x"
+#endif
+
+#else /* _MSC_EXTENSIONS */
+
+#ifndef uint64_t
+#define uint64_t       unsigned long long
+#endif
+
+#ifndef int64_t
+#define int64_t                long long
+#endif
+
+#ifndef PRId64
+#define PRId64         "lld"
+#endif
+
+#ifndef PRIo64
+#define PRIo64         "llo"
+#endif
+
+#ifndef PRIu64
+#define PRIu64         "llu"
+#endif
+
+#ifndef PRIx64
+#define PRIx64         "llx"
+#endif
+
+#endif /* _MSC_EXTENSIONS */
+
 #if !defined(__MINGW32__) && !defined(__WATCOMC__)
 #define stat _stat
 #define open _open