diff options
| author | Bernard Xiong <[email protected]> | 2021-05-13 09:13:45 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-05-13 09:13:45 +0800 |
| commit | eca044f87c629c2df08dfc66cea399c6be9b102f (patch) | |
| tree | 93468dc007bc0716c96fa1c06560f76dd32e008a | |
| parent | 07a7bcabb9abb6cf06057a1575cd94862e60aeb2 (diff) | |
| parent | dfb8df71c90e6f306e7abebd7ad94ef93e970ca9 (diff) | |
Merge pull request #4679 from mysterywolf/sys-errno
[bug][libc]修复因libc移除sys/errno.h文件导致的报错
| -rw-r--r-- | components/libc/pthreads/posix_types.h | 7 | ||||
| -rw-r--r-- | components/net/lwip-2.1.2/src/arch/include/arch/cc.h | 9 |
2 files changed, 4 insertions, 12 deletions
diff --git a/components/libc/pthreads/posix_types.h b/components/libc/pthreads/posix_types.h index f2d806cc9a..942657ef39 100644 --- a/components/libc/pthreads/posix_types.h +++ b/components/libc/pthreads/posix_types.h @@ -19,16 +19,9 @@ #include <sys/types.h> #include <sys/time.h> - -/* errno for Keil MDK */ -#if defined(__CC_ARM) || defined(__IAR_SYSTEMS_ICC__) -#include <sys/errno.h> -#include <sys/unistd.h> -#else #include <unistd.h> #include <errno.h> #include <fcntl.h> -#endif #endif diff --git a/components/net/lwip-2.1.2/src/arch/include/arch/cc.h b/components/net/lwip-2.1.2/src/arch/include/arch/cc.h index 320beb53e0..413fef65df 100644 --- a/components/net/lwip-2.1.2/src/arch/include/arch/cc.h +++ b/components/net/lwip-2.1.2/src/arch/include/arch/cc.h @@ -46,17 +46,16 @@ #define X32_F "lx" #ifdef RT_USING_LIBC -#if defined(__CC_ARM) || defined(__CLANG_ARM) || defined(__IAR_SYSTEMS_ICC__) -#include <sys/errno.h> -#else #include <errno.h> -/* some errno not defined in newlib */ +#ifndef ENSRNOTFOUND #define ENSRNOTFOUND 163 /* Domain name not found */ +#endif +#ifndef ESHUTDOWN /* WARNING: ESHUTDOWN also not defined in newlib. We chose 180 here because the number "108" which is used in arch.h has been assigned to another error code. */ #define ESHUTDOWN 180 -#endif /* __CC_ARM/__IAR_SYSTEMS_ICC__ */ +#endif #endif /* RT_USING_LIBC */ #if defined(RT_USING_LIBC) || defined(RT_LIBC_USING_TIME) || (defined( __GNUC__ ) && !defined(__ARMCC_VERSION)) |