From 28433d9d54d25eb1d4c8e5d99a87dae20851b77b Mon Sep 17 00:00:00 2001 From: bernard Date: Fri, 3 Nov 2017 21:08:31 +0800 Subject: [PATCH] [lwIP] Fix the compiling warning for lwip-1.4.1 --- components/net/lwip-1.4.1/src/arch/include/arch/cc.h | 4 ---- components/net/lwip-1.4.1/src/lwipopts.h | 4 ++++ 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 /** -- GitLab