Prefix ENUM types ip IPDC_ in order to prevent type clashes with windows

includes (MSVC). Proposed fix by Ulf Lamping.

svn path=/trunk/; revision=10427

1 files changed, 113 insertions, 113 deletions

diff --git a/packet-ipdc.h b/packet-ipdc.h
index 8aaafe2c61..2d03b4aaff 100644
--- a/packet-ipdc.h
+++ b/packet-ipdc.h
@@ -3,7 +3,7 @@
  * Copyright Lucent Technologies 2004
  * Josh Bailey <joshbailey@lucent.com> and Ruud Linders <ruud@lucent.com>
  *
- * $Id: packet-ipdc.h,v 1.3 2004/03/20 10:47:00 jmayer Exp $
+ * $Id: packet-ipdc.h,v 1.4 2004/03/21 19:57:13 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -30,15 +30,15 @@
 #define	TEXT_UNDEFINED	"UNDEFINED"
 
 typedef enum {
-	UNKNOWN,
-	UINT,
-	ASCII,
-	BYTE,
-	OCTET,
-	IPA,
-	LINESTATUS,
-	CHANNELSTATUS,
-	Q931
+	IPDC_UNKNOWN,
+	IPDC_UINT,
+	IPDC_ASCII,
+	IPDC_BYTE,
+	IPDC_OCTET,
+	IPDC_IPA,
+	IPDC_LINESTATUS,
+	IPDC_CHANNELSTATUS,
+	IPDC_Q931
 } ipdc_tag_type; 
 
 static const value_string line_status_vals[] = {
@@ -240,109 +240,109 @@ typedef struct _ipdc_tag_type_val {
 } ipdc_tag_type_val;
 
 static const ipdc_tag_type_val ipdc_tag_types[] = {
-	{ 0x01, UINT },
-	{ 0x02, ASCII },
-	{ 0x03, ASCII },
-	{ 0x04, UINT },
-	{ 0x05, ASCII },
-	{ 0x07, UINT },
-	{ 0x0A, BYTE },
-	{ 0x0C, BYTE },
-	{ 0x0D, UINT },
-	{ 0x14, BYTE },
-	{ 0x15, UINT },
-	{ 0x17, BYTE },
-	{ 0x18, ASCII },
-	{ 0x19, ASCII },
-	{ 0x1B, IPA },
-	{ 0x1C, UINT },
-	{ 0x20, UINT },
-	{ 0x21, LINESTATUS },
-	{ 0x22, UINT },
-	{ 0x23, CHANNELSTATUS },
-	{ 0x24, BYTE },
-	{ 0x25, OCTET }, /* TBD */
-	{ 0x26, BYTE },
-	{ 0x27, BYTE },
-	{ 0x28, UINT },
-	{ 0x29, UINT },
-	{ 0x2A, BYTE },
-	{ 0x2B, BYTE },
-	{ 0x2C, UINT },
-	{ 0x2D, BYTE },
-	{ 0x31, UINT },
-	{ 0x32, UINT },
-	{ 0x33, ASCII },
-	{ 0x34, ASCII },
-	{ 0x35, BYTE },
-	{ 0x36, UINT },
-	{ 0x37, UINT },
-	{ 0x38, UINT },
-	{ 0x39, UINT },
-	{ 0x3A, IPA },
-	{ 0x3B, UINT },
-	{ 0x3C, BYTE },
-	{ 0x3D, ASCII },
-	{ 0x3E, UINT },
-	{ 0x40, UINT },
-	{ 0x46, UINT },
-	{ 0x49, BYTE },
-	{ 0x4A, BYTE },
-	{ 0x5D, IPA },
-	{ 0x5E, UINT },
-	{ 0x5F, IPA },
-	{ 0x60, UINT },
-	{ 0x65, BYTE },
-	{ 0x66, BYTE },
-	{ 0x67, UINT },
-	{ 0x68, UINT },
-	{ 0x69, IPA },
-	{ 0x6A, BYTE },
-	{ 0x6F, BYTE },
-	{ 0x70, BYTE },
-	{ 0x71, UINT },
-	{ 0x72, BYTE },
-	{ 0x73, UINT },
-	{ 0x74, BYTE },
-	{ 0x75, BYTE },
-	{ 0x76, BYTE },
-	{ 0x77, BYTE },
-	{ 0x78, BYTE },
-	{ 0x7B, BYTE },
-	{ 0x7C, UINT },
-	{ 0x7D, BYTE },
-	{ 0x7E, UINT },
-	{ 0x86, BYTE },
-	{ 0x90, BYTE },
-	{ 0x91, UINT },
-	{ 0x92, UINT },
-	{ 0x93, UINT },
-	{ 0x94, UINT },
-	{ 0x95, UINT },
-	{ 0x96, UINT },
-	{ 0x97, UINT },
-	{ 0x98, UINT },
-	{ 0x99, UINT },
-	{ 0x9D, UINT },
-	{ 0x9E, UINT },
-	{ 0x9F, UINT },
-	{ 0xA0, UINT },
-	{ 0xA1, UINT },
-	{ 0xA2, Q931 },
-	{ 0xA3, BYTE },
-	{ 0xA4, BYTE },
-	{ 0xA5, BYTE },
-	{ 0xA6, UINT },
-	{ 0xA7, UINT },
-	{ 0xB0, BYTE },
-	{ 0xB1, BYTE },
-	{ 0xB2, OCTET },
-	{ 0xB3, OCTET },
-	{ 0xC1, BYTE },
-	{ 0xC2, UINT },
-	{ 0xC3, UINT },
-	{ 0xFE, UINT },
-	{ 0xFFFF, UNKNOWN },
+	{ 0x01, IPDC_UINT },
+	{ 0x02, IPDC_ASCII },
+	{ 0x03, IPDC_ASCII },
+	{ 0x04, IPDC_UINT },
+	{ 0x05, IPDC_ASCII },
+	{ 0x07, IPDC_UINT },
+	{ 0x0A, IPDC_BYTE },
+	{ 0x0C, IPDC_BYTE },
+	{ 0x0D, IPDC_UINT },
+	{ 0x14, IPDC_BYTE },
+	{ 0x15, IPDC_UINT },
+	{ 0x17, IPDC_BYTE },
+	{ 0x18, IPDC_ASCII },
+	{ 0x19, IPDC_ASCII },
+	{ 0x1B, IPDC_IPA },
+	{ 0x1C, IPDC_UINT },
+	{ 0x20, IPDC_UINT },
+	{ 0x21, IPDC_LINESTATUS },
+	{ 0x22, IPDC_UINT },
+	{ 0x23, IPDC_CHANNELSTATUS },
+	{ 0x24, IPDC_BYTE },
+	{ 0x25, IPDC_OCTET }, /* TBD */
+	{ 0x26, IPDC_BYTE },
+	{ 0x27, IPDC_BYTE },
+	{ 0x28, IPDC_UINT },
+	{ 0x29, IPDC_UINT },
+	{ 0x2A, IPDC_BYTE },
+	{ 0x2B, IPDC_BYTE },
+	{ 0x2C, IPDC_UINT },
+	{ 0x2D, IPDC_BYTE },
+	{ 0x31, IPDC_UINT },
+	{ 0x32, IPDC_UINT },
+	{ 0x33, IPDC_ASCII },
+	{ 0x34, IPDC_ASCII },
+	{ 0x35, IPDC_BYTE },
+	{ 0x36, IPDC_UINT },
+	{ 0x37, IPDC_UINT },
+	{ 0x38, IPDC_UINT },
+	{ 0x39, IPDC_UINT },
+	{ 0x3A, IPDC_IPA },
+	{ 0x3B, IPDC_UINT },
+	{ 0x3C, IPDC_BYTE },
+	{ 0x3D, IPDC_ASCII },
+	{ 0x3E, IPDC_UINT },
+	{ 0x40, IPDC_UINT },
+	{ 0x46, IPDC_UINT },
+	{ 0x49, IPDC_BYTE },
+	{ 0x4A, IPDC_BYTE },
+	{ 0x5D, IPDC_IPA },
+	{ 0x5E, IPDC_UINT },
+	{ 0x5F, IPDC_IPA },
+	{ 0x60, IPDC_UINT },
+	{ 0x65, IPDC_BYTE },
+	{ 0x66, IPDC_BYTE },
+	{ 0x67, IPDC_UINT },
+	{ 0x68, IPDC_UINT },
+	{ 0x69, IPDC_IPA },
+	{ 0x6A, IPDC_BYTE },
+	{ 0x6F, IPDC_BYTE },
+	{ 0x70, IPDC_BYTE },
+	{ 0x71, IPDC_UINT },
+	{ 0x72, IPDC_BYTE },
+	{ 0x73, IPDC_UINT },
+	{ 0x74, IPDC_BYTE },
+	{ 0x75, IPDC_BYTE },
+	{ 0x76, IPDC_BYTE },
+	{ 0x77, IPDC_BYTE },
+	{ 0x78, IPDC_BYTE },
+	{ 0x7B, IPDC_BYTE },
+	{ 0x7C, IPDC_UINT },
+	{ 0x7D, IPDC_BYTE },
+	{ 0x7E, IPDC_UINT },
+	{ 0x86, IPDC_BYTE },
+	{ 0x90, IPDC_BYTE },
+	{ 0x91, IPDC_UINT },
+	{ 0x92, IPDC_UINT },
+	{ 0x93, IPDC_UINT },
+	{ 0x94, IPDC_UINT },
+	{ 0x95, IPDC_UINT },
+	{ 0x96, IPDC_UINT },
+	{ 0x97, IPDC_UINT },
+	{ 0x98, IPDC_UINT },
+	{ 0x99, IPDC_UINT },
+	{ 0x9D, IPDC_UINT },
+	{ 0x9E, IPDC_UINT },
+	{ 0x9F, IPDC_UINT },
+	{ 0xA0, IPDC_UINT },
+	{ 0xA1, IPDC_UINT },
+	{ 0xA2, IPDC_Q931 },
+	{ 0xA3, IPDC_BYTE },
+	{ 0xA4, IPDC_BYTE },
+	{ 0xA5, IPDC_BYTE },
+	{ 0xA6, IPDC_UINT },
+	{ 0xA7, IPDC_UINT },
+	{ 0xB0, IPDC_BYTE },
+	{ 0xB1, IPDC_BYTE },
+	{ 0xB2, IPDC_OCTET },
+	{ 0xB3, IPDC_OCTET },
+	{ 0xC1, IPDC_BYTE },
+	{ 0xC2, IPDC_UINT },
+	{ 0xC3, IPDC_UINT },
+	{ 0xFE, IPDC_UINT },
+	{ 0xFFFF, IPDC_UNKNOWN },
 };
 
 #define	IPDC_TAG(x)	(256 * (x))