From eca2fae28a1cd911c4387d35c8e50ce1138add10 Mon Sep 17 00:00:00 2001 From: YOUR_NAME Date: Mon, 12 Apr 2021 20:37:22 +0800 Subject: [PATCH] IssueNo:#I3IBCL Description:use posix instead of lwip self Feature or Bugfix:Bugfix Binary Source:No --- components/net/lwip-2.1/porting/include/arch/cc.h | 4 ++-- components/net/lwip-2.1/porting/include/lwip/netif.h | 8 ++++---- .../net/lwip-2.1/porting/include/lwip/sockets.h | 12 ++++++------ components/net/lwip-2.1/porting/src/netdb_porting.c | 1 - 4 files changed, 12 insertions(+), 13 deletions(-) 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 4a3e5903..c2eebaf5 100644 --- a/components/net/lwip-2.1/porting/include/arch/cc.h +++ b/components/net/lwip-2.1/porting/include/arch/cc.h @@ -64,10 +64,10 @@ #define LWIP_DNS_API_DECLARE_STRUCTS 0 #ifndef __SIZEOF_POINTER__ -#define __SIZEOF_POINTER__ 4 // 32位系统 +#define __SIZEOF_POINTER__ 4 // 32 bit system #endif -#define LOS_TASK_STATUS_DETACHED 0x0100 // 预留字段 +#define LOS_TASK_STATUS_DETACHED 0x0100 // reserved #if defined(__arm__) && defined(__ARMCC_VERSION) /* Keil uVision4 tools */ 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 bba71682..1e57b768 100644 --- a/components/net/lwip-2.1/porting/include/lwip/netif.h +++ b/components/net/lwip-2.1/porting/include/lwip/netif.h @@ -32,8 +32,8 @@ #ifndef _LWIP_PORTING_NETIF_H_ #define _LWIP_PORTING_NETIF_H_ -#include // For IFNAMSIZ/IF_NAMESIZE and `struct ifreq', by `lwip/netif.h' and `api/sockets.c' -#include // For IP_OFFMASK, by `core/ipv4/ip4_frag.c' +#include +#include #define netif_find netifapi_netif_find_by_name @@ -54,7 +54,7 @@ #undef LWIP_NETIF_CLIENT_DATA_INDEX_DHCP #endif -#include // For ETHARP_HWADDR_LEN, by `hieth-sf src/interface.c' and `wal/wal_net.c' +#include #ifdef __cplusplus extern "C" { @@ -64,7 +64,7 @@ extern "C" { #undef NETIF_NAMESIZE #define NETIF_NAMESIZE IFNAMSIZ -#define LOOPBACK_IF 0 // 772 +#define LOOPBACK_IF 0 #define ETHERNET_DRIVER_IF 1 #define WIFI_DRIVER_IF 801 #define BT_PROXY_IF 802 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 0aefba52..3ff28693 100644 --- a/components/net/lwip-2.1/porting/include/lwip/sockets.h +++ b/components/net/lwip-2.1/porting/include/lwip/sockets.h @@ -33,13 +33,13 @@ #define _LWIP_PORTING_SOCKETS_H_ #include -#include // For poll_table -#include // For TCP_NODELAY etc. +#include +#include #include -#include // For FIONREAD etc. -#include // For FD_SET -#include // For IOV_MAX -#include // For F_SETFL +#include +#include +#include +#include #include_next #include diff --git a/components/net/lwip-2.1/porting/src/netdb_porting.c b/components/net/lwip-2.1/porting/src/netdb_porting.c index 30accb25..804d7e07 100644 --- a/components/net/lwip-2.1/porting/src/netdb_porting.c +++ b/components/net/lwip-2.1/porting/src/netdb_porting.c @@ -29,7 +29,6 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "netdb.h" #include "lwip/netdb.h" struct hostent *gethostbyname(const char *name)