diff options
author | ulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7> | 2005-09-20 02:10:48 +0000 |
---|---|---|
committer | ulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7> | 2005-09-20 02:10:48 +0000 |
commit | 1f72a41fd77d80f7a70a3c8a3b6b48136abc0614 (patch) | |
tree | 61257ba816ab0ec3c856a3d34572b54ff981b379 /capture_wpcap_packet.c | |
parent | 1def118a78cfb038607b404582545b932a842b9e (diff) |
the buildbot has a problem not knowing sa_family_t, define eth_sa_family_t and use it here (ok, this *is* a dirty hack)
don't know why the last commit compiled on my machine and not on the buildbot.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@15887 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'capture_wpcap_packet.c')
-rw-r--r-- | capture_wpcap_packet.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/capture_wpcap_packet.c b/capture_wpcap_packet.c index 419109906b..107ad4eca9 100644 --- a/capture_wpcap_packet.c +++ b/capture_wpcap_packet.c @@ -46,7 +46,10 @@ #ifndef HAVE_SOCKADDR_STORAGE /* packet32.h requires sockaddr_storage (usually defined in Platform SDK) - * copied from RFC2553 (and slightly modified because of datatypes) ... */ + * copied from RFC2553 (and slightly modified because of datatypes) ... + * XXX - defined more than once, move this to a header file */ +typedef unsigned short eth_sa_family_t; + /* * Desired design of maximum size and alignment */ @@ -56,12 +59,12 @@ /* * Definitions used for sockaddr_storage structure paddings design. */ -#define ETH_SS_PAD1SIZE (ETH_SS_ALIGNSIZE - sizeof (sa_family_t)) -#define ETH_SS_PAD2SIZE (ETH_SS_MAXSIZE - (sizeof (sa_family_t) + \ +#define ETH_SS_PAD1SIZE (ETH_SS_ALIGNSIZE - sizeof (eth_sa_family_t)) +#define ETH_SS_PAD2SIZE (ETH_SS_MAXSIZE - (sizeof (eth_sa_family_t) + \ ETH_SS_PAD1SIZE + ETH_SS_ALIGNSIZE)) struct sockaddr_storage { - sa_family_t __ss_family; /* address family */ + eth_sa_family_t __ss_family; /* address family */ /* Following fields are implementation specific */ char __ss_pad1[ETH_SS_PAD1SIZE]; /* 6 byte pad, this is to make implementation |