summaryrefslogtreecommitdiff
path: root/components/net
diff options
context:
space:
mode:
authorbernard <[email protected]>2017-11-03 21:08:31 +0800
committerbernard <[email protected]>2017-11-03 21:08:31 +0800
commit28433d9d54d25eb1d4c8e5d99a87dae20851b77b (patch)
treee651276dee7c0e08d35702a1c1ac0ce09d65feb2 /components/net
parentbbe6425f9404820d04c4aef783701a1f8521cb15 (diff)
[lwIP] Fix the compiling warning for lwip-1.4.1
Diffstat (limited to 'components/net')
-rw-r--r--components/net/lwip-1.4.1/src/arch/include/arch/cc.h4
-rw-r--r--components/net/lwip-1.4.1/src/lwipopts.h4
2 files changed, 4 insertions, 4 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 62aa6c8ab4..3889ec9577 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
@@ -76,10 +76,6 @@ typedef rt_uint32_t mem_ptr_t;
#define LWIP_TIMEVAL_PRIVATE 1
#endif
-#if defined(RT_USING_DFS_NET)
-#define LWIP_COMPAT_SOCKETS 0
-#endif
-
#if defined(__CC_ARM) /* ARMCC compiler */
#define PACK_STRUCT_FIELD(x) x
#define PACK_STRUCT_STRUCT __attribute__ ((__packed__))
diff --git a/components/net/lwip-1.4.1/src/lwipopts.h b/components/net/lwip-1.4.1/src/lwipopts.h
index 755593388e..0b177b5894 100644
--- a/components/net/lwip-1.4.1/src/lwipopts.h
+++ b/components/net/lwip-1.4.1/src/lwipopts.h
@@ -363,9 +363,13 @@
* LWIP_COMPAT_SOCKETS==1: Enable BSD-style sockets functions names.
* (only used if you use sockets.c)
*/
+#ifdef RT_USING_DFS_NET
+#define LWIP_COMPAT_SOCKETS 0
+#else
#ifndef LWIP_COMPAT_SOCKETS
#define LWIP_COMPAT_SOCKETS 1
#endif
+#endif
/**