From: Guy Harris <guy@alum.mit.edu>
Date: Sun, 4 Apr 2010 20:49:03 +0000 (-0700)
Subject: Fix error, pick up stuff from libpcap bittypes.h.
X-Git-Tag: tcpdump-4.2.1~113
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/3938c9fe904ca2106dd8ecaf602ae068dda414c2

Fix error, pick up stuff from libpcap bittypes.h.
---

diff --git a/Win32/Include/bittypes.h b/Win32/Include/bittypes.h
index 528e6c99..95aa9faa 100644
--- a/Win32/Include/bittypes.h
+++ b/Win32/Include/bittypes.h
@@ -26,24 +26,32 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
+#ifndef _BITTYPES_H
+#define _BITTYPES_H
+
 #ifndef HAVE_U_INT8_T
 typedef unsigned char u_int8_t;
+typedef signed char int8_t;
 #endif /* HAVE_U_INT8_T */
 
 #ifndef HAVE_U_INT16_T
 typedef unsigned short u_int16_t;
+typedef signed short int16_t;
 #endif /* HAVE_U_INT16_T */
 
 #ifndef HAVE_U_INT32_T
 typedef unsigned int u_int32_t;
+typedef signed int int32_t;
 #endif /* HAVE_U_INT32_T */
 
 #ifndef HAVE_U_INT64_T
 #ifdef _MSC_EXTENSIONS
 typedef unsigned _int64 u_int64_t;
+typedef _int64 int64_t;
 #else /* _MSC_EXTENSIONS */
 typedef unsigned long long u_int64_t;
-#else /* _MSC_EXTENSIONS */
+typedef long long int64_t;
+#endif /* _MSC_EXTENSIONS */
 #endif /* HAVE_U_INT64_T */
 
 #ifndef PRId64
@@ -77,3 +85,5 @@ typedef unsigned long long u_int64_t;
 #define PRIu64	"llu"
 #endif /* _MSC_EXTENSIONS */
 #endif /* PRIu64 */
+
+#endif /* _BITTYPES_H */