summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorliuxianliang <[email protected]>2020-06-18 16:42:02 +0800
committerliuxianliang <[email protected]>2020-06-18 16:42:02 +0800
commitf715f29588e705f47d0c5a86c33f9f03ab58fe5d (patch)
tree81ac56a4b9492bdb7d610a0c4b2754c4fec1a32a
parent7945e793470ae6e9d81afa1a67da85aa067f0a60 (diff)
[fix] lwip clock confict with minilib clock
Signed-off-by: liuxianliang <[email protected]>
-rw-r--r--components/net/lwip-1.4.1/src/arch/include/arch/cc.h2
-rw-r--r--components/net/lwip-2.0.2/src/arch/include/arch/cc.h2
-rw-r--r--components/net/lwip-2.1.0/src/arch/include/arch/cc.h2
3 files changed, 3 insertions, 3 deletions
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 06c0be6670..5304091755 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
@@ -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
diff --git a/components/net/lwip-2.0.2/src/arch/include/arch/cc.h b/components/net/lwip-2.0.2/src/arch/include/arch/cc.h
index 9663935da6..491cab6b5f 100644
--- a/components/net/lwip-2.0.2/src/arch/include/arch/cc.h
+++ b/components/net/lwip-2.0.2/src/arch/include/arch/cc.h
@@ -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
diff --git a/components/net/lwip-2.1.0/src/arch/include/arch/cc.h b/components/net/lwip-2.1.0/src/arch/include/arch/cc.h
index 77a589276a..adb0f269be 100644
--- a/components/net/lwip-2.1.0/src/arch/include/arch/cc.h
+++ b/components/net/lwip-2.1.0/src/arch/include/arch/cc.h
@@ -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