diff options
| author | Guy Harris <guy@alum.mit.edu> | 2000-11-04 07:35:17 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2000-11-04 07:35:17 +0000 |
| commit | d23e1df0a765989f53180493bed3c395c53fc066 (patch) | |
| tree | 8233743c4c96b96c3cadb040cc4fe951a6d8b91d /packet-wsp.c | |
| parent | 8c6db228bf7235014a0e2f925db4efb2c30f57ce (diff) | |
| download | wireshark-d23e1df0a765989f53180493bed3c395c53fc066.tar.gz wireshark-d23e1df0a765989f53180493bed3c395c53fc066.tar.bz2 wireshark-d23e1df0a765989f53180493bed3c395c53fc066.zip | |
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.
svn path=/trunk/; revision=2559
Diffstat (limited to 'packet-wsp.c')
| -rw-r--r-- | packet-wsp.c | 9 |
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, |