Make it clearer that the hex or hex-and-ASCII dump for "-x", "-xx",

[tcpdump] / decnet.h

diff --git a/decnet.h b/decnet.h
index bccce358447de6f2e53b532917fbee2372175b38..d25d157d4270fa7eb5ceda449eba205835ab9ad4 100644 (file)
--- a/decnet.h
+++ b/decnet.h
@@ -18,10 +18,18 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * @(#) $Header: /tcpdump/master/tcpdump/decnet.h,v 1.7 2000-10-03 02:54:55 itojun Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/tcpdump/decnet.h,v 1.11 2002-12-11 07:13:50 guy Exp $ (LBL)
  */
 
+#ifndef WIN32
 typedef u_int8_t byte[1];              /* single byte field */
+#else
+/*
+ * the keyword 'byte' generates conflicts in Windows
+ */
+typedef unsigned char Byte[1];         /* single byte field */
+#define byte Byte
+#endif /* WIN32 */
 typedef u_int8_t word[2];              /* 2 byte field */
 typedef u_int8_t longword[4];          /* 4 bytes field */