aboutsummaryrefslogtreecommitdiffstats
path: root/packet-wsp.c
diff options
context:
space:
mode:
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2000-11-04 07:35:17 +0000
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2000-11-04 07:35:17 +0000
commitb59140ec274825b9c16d9250c7052a7fe75e8233 (patch)
tree8233743c4c96b96c3cadb040cc4fe951a6d8b91d /packet-wsp.c
parent5f6c5ddea3f041d0481967b7cc08e2f871dd2cd2 (diff)
One of the header files included by "packet-wsp.c", or one of the header
files one of those header files includes (compute transitive closure here), appears to define DELETE, on Windows, in a fashion that causes "packet-wsp.c" not to compile. Undefine DELETE before using it as a name for an enum value. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2559 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-wsp.c')
-rw-r--r--packet-wsp.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/packet-wsp.c b/packet-wsp.c
index 98fbd649a2..e32364cabc 100644
--- a/packet-wsp.c
+++ b/packet-wsp.c
@@ -3,7 +3,7 @@
*
* Routines to dissect WSP component of WAP traffic.
*
- * $Id: packet-wsp.c,v 1.1 2000/11/04 03:30:40 guy Exp $
+ * $Id: packet-wsp.c,v 1.2 2000/11/04 07:35:17 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -277,6 +277,13 @@ static const value_string vals_cache_control[] = {
{ 0x8A, "Proxy-revalidate" },
};
+/*
+ * Windows appears to define DELETE.
+ */
+#ifdef DELETE
+#undef DELETE
+#endif
+
enum {
RESERVED = 0x00,
CONNECT = 0x01,