diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2007-01-02 01:52:47 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2007-01-02 01:52:47 +0000 |
| commit | bcf21a35d6f2e0415ece0c76141ea3781dda7611 (patch) | |
| tree | d62b2ed60c76896533c82d30906456fba0662d10 /capture_wpcap_packet.c | |
| parent | 6bb21fbafdf0574a3fef93e1839d994c4cfee18e (diff) | |
| download | wireshark-bcf21a35d6f2e0415ece0c76141ea3781dda7611.tar.gz | |
MSVC2006 defines sockaddr_storage, so we shouldn't define this on our own for MSVC2006
this might be depending on the Platform SDK and not on MSVC version - I don't really know
svn path=/trunk/; revision=20259
Diffstat (limited to 'capture_wpcap_packet.c')
| -rw-r--r-- | capture_wpcap_packet.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/capture_wpcap_packet.c b/capture_wpcap_packet.c index 62623ca06b..d055a72d59 100644 --- a/capture_wpcap_packet.c +++ b/capture_wpcap_packet.c @@ -63,6 +63,12 @@ typedef unsigned short eth_sa_family_t; #define ETH_SS_PAD2SIZE (ETH_SS_MAXSIZE - (sizeof (eth_sa_family_t) + \ ETH_SS_PAD1SIZE + ETH_SS_ALIGNSIZE)) +/* sockaddr_storage problem with different MSVC versions + * - MSVC 6 (1200) doesn't define this + * - MSVC 7 (1300) unknown + * - MSVC 8 (1400) does */ +/* we might need to tweak this #if, see version_info for _MSC_VER values */ +#if _MSC_VER < 1400 struct sockaddr_storage { eth_sa_family_t __ss_family; /* address family */ /* Following fields are implementation specific */ @@ -78,6 +84,7 @@ struct sockaddr_storage { /* __ss_pad1, __ss_align fields is 112 */ }; /* ... copied from RFC2553 */ +#endif /* _MSC_VER */ #endif |