Skip to content

Commit f715f29

Browse files
author
liuxianliang
committed
[fix] lwip clock confict with minilib clock
Signed-off-by: liuxianliang <[email protected]>
1 parent 7945e79 commit f715f29

File tree

3 files changed

+3
-3
lines changed
  • components/net
    • lwip-1.4.1/src/arch/include/arch
    • lwip-2.0.2/src/arch/include/arch
    • lwip-2.1.0/src/arch/include/arch

3 files changed

+3
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ typedef uintptr_t mem_ptr_t;
6666
#endif /* __CC_ARM/__IAR_SYSTEMS_ICC__ */
6767
#endif
6868

69-
#if defined(RT_USING_LIBC) || defined(RT_USING_MINILIBC)
69+
#if defined(RT_USING_LIBC) || defined(RT_USING_MINILIBC) || defined(RT_LIBC_USING_TIME)
7070
#include <sys/time.h>
7171
#define LWIP_TIMEVAL_PRIVATE 0
7272
#else

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
#define S32_F "ld"
4646
#define X32_F "lx"
4747

48-
#if defined(RT_USING_LIBC) || defined(RT_USING_MINILIBC)
48+
#if defined(RT_USING_LIBC) || defined(RT_USING_MINILIBC) || defined(RT_LIBC_USING_TIME)
4949
#include <sys/time.h>
5050
#define LWIP_TIMEVAL_PRIVATE 0
5151
#else

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
#define LWIP_PROVIDE_ERRNO
6262
#endif
6363

64-
#if defined(RT_USING_LIBC) || defined(RT_USING_MINILIBC)
64+
#if defined(RT_USING_LIBC) || defined(RT_USING_MINILIBC) || defined(RT_LIBC_USING_TIME)
6565
#include <sys/time.h>
6666
#define LWIP_TIMEVAL_PRIVATE 0
6767
#else

0 commit comments

Comments
 (0)