Merge pull request #3703 from xiangxistu/master

[fix] lwip clock confict with minilibc clock

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

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

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