Mirrors_Framework/rt-thread
1
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2026-03-27 09:32:28 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #3703 from xiangxistu/master

Browse Source 
[fix] lwip clock confict with minilibc clock
This commit is contained in:
Bernard Xiong
2020-06-18 17:30:16 +08:00
committed by GitHub
parent 7945e79347 f715f29588
commit f13b322e96
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/net/lwip-1.4.1/src/arch/include/arch/cc.h
View File

@@ -66,7 +66,7 @@ typedef uintptr_t mem_ptr_t;
#endif /* __CC_ARM/__IAR_SYSTEMS_ICC__ */
#endif
#if defined(RT_USING_LIBC) || defined(RT_USING_MINILIBC)
#if defined(RT_USING_LIBC) || defined(RT_USING_MINILIBC) || defined(RT_LIBC_USING_TIME)
#include <sys/time.h>
#define LWIP_TIMEVAL_PRIVATE 0
#else

2
components/net/lwip-2.0.2/src/arch/include/arch/cc.h
View File

@@ -45,7 +45,7 @@
#define S32_F "ld"
#define X32_F "lx"
#if defined(RT_USING_LIBC) || defined(RT_USING_MINILIBC)
#if defined(RT_USING_LIBC) || defined(RT_USING_MINILIBC) || defined(RT_LIBC_USING_TIME)
#include <sys/time.h>
#define LWIP_TIMEVAL_PRIVATE 0
#else

2
components/net/lwip-2.1.0/src/arch/include/arch/cc.h
View File

@@ -61,7 +61,7 @@
#define LWIP_PROVIDE_ERRNO
#endif
#if defined(RT_USING_LIBC) || defined(RT_USING_MINILIBC)
#if defined(RT_USING_LIBC) || defined(RT_USING_MINILIBC) || defined(RT_LIBC_USING_TIME)
#include <sys/time.h>
#define LWIP_TIMEVAL_PRIVATE 0
#else