diff --git a/components/net/lwip-2.1/BUILD.gn b/components/net/lwip-2.1/BUILD.gn index 1d1ee29a..c48d68b7 100644 --- a/components/net/lwip-2.1/BUILD.gn +++ b/components/net/lwip-2.1/BUILD.gn @@ -34,7 +34,6 @@ module_switch = defined(LOSCFG_NET_LWIP_SACK) module_name = "lwip" kernel_module(module_name) { sources = LWIP_PORTING_FILES + LWIPNOAPPSFILES - [ "$LWIPDIR/api/sockets.c" ] - defines = [ "_BSD_SOURCE=1" ] include_dirs = [ "//utils/native/lite/include" ] } diff --git a/components/net/lwip-2.1/porting/include/arch/cc.h b/components/net/lwip-2.1/porting/include/arch/cc.h index 2b8faf91..09462703 100644 --- a/components/net/lwip-2.1/porting/include/arch/cc.h +++ b/components/net/lwip-2.1/porting/include/arch/cc.h @@ -106,4 +106,8 @@ extern void LwipLogPrintf(const char *fmt, ...); #define init_waitqueue_head(...) #define poll_check_waiters(...) +#ifndef _BSD_SOURCE +#define _BSD_SOURCE 1 +#endif + #endif /* _LWIP_PORTING_CC_H_ */ diff --git a/components/net/lwip-2.1/porting/include/lwip/netdb.h b/components/net/lwip-2.1/porting/include/lwip/netdb.h index aea2dbc9..0533eb32 100644 --- a/components/net/lwip-2.1/porting/include/lwip/netdb.h +++ b/components/net/lwip-2.1/porting/include/lwip/netdb.h @@ -32,6 +32,7 @@ #ifndef _LWIP_PORTING_NETDB_H_ #define _LWIP_PORTING_NETDB_H_ +#include "lwip/arch.h" #include #include_next diff --git a/components/net/lwip-2.1/porting/include/lwip/netif.h b/components/net/lwip-2.1/porting/include/lwip/netif.h index f920fbda..20d4f614 100644 --- a/components/net/lwip-2.1/porting/include/lwip/netif.h +++ b/components/net/lwip-2.1/porting/include/lwip/netif.h @@ -32,6 +32,7 @@ #ifndef _LWIP_PORTING_NETIF_H_ #define _LWIP_PORTING_NETIF_H_ +#include "lwip/arch.h" #include #include diff --git a/components/net/lwip-2.1/porting/include/lwip/sockets.h b/components/net/lwip-2.1/porting/include/lwip/sockets.h index 792a8f63..f2f853e2 100644 --- a/components/net/lwip-2.1/porting/include/lwip/sockets.h +++ b/components/net/lwip-2.1/porting/include/lwip/sockets.h @@ -32,6 +32,7 @@ #ifndef _LWIP_PORTING_SOCKETS_H_ #define _LWIP_PORTING_SOCKETS_H_ +#include "lwip/arch.h" #include #include #include diff --git a/components/net/lwip-2.1/porting/src/sockets_porting.c b/components/net/lwip-2.1/porting/src/sockets_porting.c index daae4724..05c717e7 100644 --- a/components/net/lwip-2.1/porting/src/sockets_porting.c +++ b/components/net/lwip-2.1/porting/src/sockets_porting.c @@ -704,7 +704,7 @@ static u8_t lwip_ioctl_impl(const struct lwip_sock *sock, long cmd, void *argp) { u8_t err = 0; struct ifreq *ifr = (struct ifreq *)argp; - bool is_ipv6 = 0; + u8_t is_ipv6 = 0; /* allow it only on IPv6 sockets... */ is_ipv6 = NETCONNTYPE_ISIPV6((unsigned int)(sock->conn->type));