summaryrefslogtreecommitdiff
path: root/components/net
diff options
context:
space:
mode:
authorBernard Xiong <[email protected]>2015-05-02 22:53:08 +0800
committerBernard Xiong <[email protected]>2015-05-02 22:53:08 +0800
commit854d8866d36b6911dee2fbc77e95084b44471066 (patch)
treeb8b46f5e0d2e1c929eb324ae0ce3110fe278e706 /components/net
parent5ca3da9e1c2f917b09ffce06bd41b29bf72600ec (diff)
[DFS] fix the compiling issue under Keil MDK.
Diffstat (limited to 'components/net')
-rw-r--r--components/net/lwip-1.4.1/src/lwipopts.h19
1 files changed, 18 insertions, 1 deletions
diff --git a/components/net/lwip-1.4.1/src/lwipopts.h b/components/net/lwip-1.4.1/src/lwipopts.h
index 84f068db7a..0501df6ea8 100644
--- a/components/net/lwip-1.4.1/src/lwipopts.h
+++ b/components/net/lwip-1.4.1/src/lwipopts.h
@@ -353,8 +353,25 @@
#define LWIP_RAND rand
#endif
-#ifdef RT_USING_DFS_LWIP
+#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 <posix_types.h>
+#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 <sys/time.h>
+
+#endif
+
#endif /* __LWIPOPTS_H__ */