diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2008-05-20 21:57:14 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2008-05-20 21:57:14 +0000 |
| commit | 27c176e4ffa4262c4259c97a1a830fe965041b5b (patch) | |
| tree | c9791b2e895ac9c0ff1fa9a88e4de9bd576120e7 | |
| parent | 58459d3fba39398b53294beccc307d539bd0db33 (diff) | |
| download | wireshark-27c176e4ffa4262c4259c97a1a830fe965041b5b.tar.gz wireshark-27c176e4ffa4262c4259c97a1a830fe965041b5b.tar.bz2 wireshark-27c176e4ffa4262c4259c97a1a830fe965041b5b.zip | |
the define INET6_ADDRSTRLEN makes trouble with Microsoft Platform SDK: ws2tcpip.h and is used nowhere (with the exception of to_str.c which has it's own definition)
comment out this definition
If I made a mistake and it's really used somewhere, we could add #ifndef INET6_ADDRSTRLEN as it's done in to_str.c
svn path=/trunk/; revision=25331
| -rw-r--r-- | epan/dissectors/packet-ipv6.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ipv6.h b/epan/dissectors/packet-ipv6.h index 438b9142f4..6fd9a37ef2 100644 --- a/epan/dissectors/packet-ipv6.h +++ b/epan/dissectors/packet-ipv6.h @@ -34,7 +34,8 @@ #include <epan/ipv6-utils.h> -#define INET6_ADDRSTRLEN 46 +/* this definition makes trouble with Microsoft Platform SDK: ws2tcpip.h and is used nowhere */ +/*#define INET6_ADDRSTRLEN 46*/ /* * Definition for internet protocol version 6. |