the buildbot has a problem not knowing sa_family_t, define eth_sa_family_t and use...

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

diff --git a/capture_wpcap_packet.c b/capture_wpcap_packet.c
index 419109906bea948d7eca76c9ec9981c904723c2b..107ad4eca98366393264074a1c5b4c0d44e603a5 100644 (file)
--- 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

diff --git a/gtk/capture_if_details_dlg.c b/gtk/capture_if_details_dlg.c
index 87741c6e4e7c4c265e3a7267bae0757ea090fcda..7f0f9beda97d624c8491eb6e733b912fe4643ca0 100644 (file)
--- a/gtk/capture_if_details_dlg.c
+++ b/gtk/capture_if_details_dlg.c
@@ -51,7 +51,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
  */
@@ -61,12 +64,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