osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Ulf Lamping 2007-01-02 01:52:47 +00:00
parent 6bb21fbafd
commit bcf21a35d6
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
capture_wpcap_packet.c
View File

@ -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

7
gtk/capture_if_details_dlg.c
View File

@ -71,6 +71,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 */
@ -86,6 +92,7 @@ struct sockaddr_storage {
/* __ss_pad1, __ss_align fields is 112 */
};
/* ... copied from RFC2553 */
#endif /* _MSC_VER */
#endif