diff --git a/src/network/net_pcap.c b/src/network/net_pcap.c index 83823cf5d..00509798a 100644 --- a/src/network/net_pcap.c +++ b/src/network/net_pcap.c @@ -81,15 +81,15 @@ struct bpf_program { typedef struct pcap_if pcap_if_t; -typedef struct timeval { +typedef struct net_timeval { long tv_sec; long tv_usec; -} timeval; +} net_timeval; #define PCAP_ERRBUF_SIZE 256 struct pcap_pkthdr { - struct timeval ts; + struct net_timeval ts; bpf_u_int32 caplen; bpf_u_int32 len; }; diff --git a/src/network/slirp/ip_input.c b/src/network/slirp/ip_input.c index 7f017a238..e04d1506d 100644 --- a/src/network/slirp/ip_input.c +++ b/src/network/slirp/ip_input.c @@ -38,6 +38,7 @@ #include "slirp.h" #include "ip_icmp.h" +#include static struct ip *ip_reass(Slirp *slirp, struct ip *ip, struct ipq *fp); static void ip_freef(Slirp *slirp, struct ipq *fp); diff --git a/src/network/slirp/mbuf.c b/src/network/slirp/mbuf.c index 54ec721eb..e59db76d8 100644 --- a/src/network/slirp/mbuf.c +++ b/src/network/slirp/mbuf.c @@ -14,6 +14,7 @@ */ #include "slirp.h" +#include #define MBUF_THRESH 30 diff --git a/src/network/slirp/misc.c b/src/network/slirp/misc.c index 78515cbda..371212b34 100644 --- a/src/network/slirp/misc.c +++ b/src/network/slirp/misc.c @@ -4,6 +4,7 @@ */ #include "slirp.h" +#include #ifdef G_OS_UNIX #include #endif @@ -366,7 +367,7 @@ char *slirp_connection_info(Slirp *slirp) so->so_rcv.sb_cc, so->so_snd.sb_cc); } - return g_string_free(str, FALSE); + return g_string_free(str, false); } int slirp_bind_outbound(struct socket *so, unsigned short af)