diff --git a/components/net/lwip-1.4.1/src/arch/include/arch/cc.h b/components/net/lwip-1.4.1/src/arch/include/arch/cc.h index 0633494d1a08b21a6b53acd19d0c6694b540e1dc..a4dc1732f8351f5b1774f1e4b6a92aed95c43adf 100644 --- a/components/net/lwip-1.4.1/src/arch/include/arch/cc.h +++ b/components/net/lwip-1.4.1/src/arch/include/arch/cc.h @@ -53,7 +53,10 @@ typedef rt_uint32_t mem_ptr_t; #define S32_F "ld" #define X32_F "lx" -#ifdef RT_USING_NEWLIB +#ifdef RT_USING_LIBC +#if defined(__CC_ARM) || defined(__IAR_SYSTEMS_ICC__) +#include +#else #include /* some errno not defined in newlib */ #define ENSRNOTFOUND 163 /* Domain name not found */ @@ -61,16 +64,20 @@ typedef rt_uint32_t mem_ptr_t; 180 here because the number "108" which is used in arch.h has been assigned to another error code. */ #define ESHUTDOWN 180 -#elif RT_USING_MINILIBC -#include -#define EADDRNOTAVAIL 99 /* Cannot assign requested address */ +#endif /* __CC_ARM/__IAR_SYSTEMS_ICC__ */ #else #define LWIP_PROVIDE_ERRNO #endif -#ifdef RT_USING_MINILIBC -#include -#define LWIP_TIMEVAL_PRIVATE 0 +#ifdef RT_USING_LIBC +#include +#define LWIP_TIMEVAL_PRIVATE 0 +#else +#define LWIP_TIMEVAL_PRIVATE 1 +#endif + +#if defined(RT_USING_DFS_LWIP) +#define LWIP_COMPAT_SOCKETS 0 #endif #if defined(__CC_ARM) /* ARMCC compiler */ @@ -100,8 +107,11 @@ void sys_arch_assert(const char* file, int line); #define LWIP_PLATFORM_DIAG(x) do {rt_kprintf x;} while(0) #define LWIP_PLATFORM_ASSERT(x) do {rt_kprintf(x); sys_arch_assert(__FILE__, __LINE__);}while(0) - #include "string.h" +#define SYS_ARCH_DECL_PROTECT(level) +#define SYS_ARCH_PROTECT(level) rt_enter_critical() +#define SYS_ARCH_UNPROTECT(level) rt_exit_critical() + #endif /* __ARCH_CC_H__ */ diff --git a/components/net/lwip-1.4.1/src/lwipopts.h b/components/net/lwip-1.4.1/src/lwipopts.h index 0501df6ea8db384169c7686d05e949a6cdf55b8e..cb7def8ae6f47b2034033bf8aad25dea001f5226 100644 --- a/components/net/lwip-1.4.1/src/lwipopts.h +++ b/components/net/lwip-1.4.1/src/lwipopts.h @@ -353,25 +353,4 @@ #define LWIP_RAND rand #endif -#if defined(RT_USING_DFS_LWIP) -#define LWIP_COMPAT_SOCKETS 0 -#endif - -#if defined(__CC_ARM) || defined(__IAR_SYSTEMS_ICC__) - -#if defined(RT_USING_PTHREADS) -#define LWIP_TIMEVAL_PRIVATE 0 -#include -#else -/* there is no timeval in CC_ARM and IAR */ -#define LWIP_TIMEVAL_PRIVATE 1 -#endif /* RT_USING_PTHREADS */ - -#elif defined (__GNUC__) - -#define LWIP_TIMEVAL_PRIVATE 0 -#include - -#endif - #endif /* __LWIPOPTS_H__ */