diff options
| author | Bernard Xiong <[email protected]> | 2020-10-11 09:37:38 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-10-11 09:37:38 +0800 |
| commit | a5cd7e7abd60e166b991375fcec686b44b818a11 (patch) | |
| tree | 32fb9db43ae7230198a5802f1dcfa63fb286c936 /include/libc/libc_errno.h | |
| parent | b1f528ea69aea916918f290f2694ddd7c741d521 (diff) | |
| parent | c7aa6f0619318a3730fc4f4689d2cd2e72efed52 (diff) | |
Merge pull request #3944 from mysterywolf/libc
[fix bug] #3902
Diffstat (limited to 'include/libc/libc_errno.h')
| -rw-r--r-- | include/libc/libc_errno.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/libc/libc_errno.h b/include/libc/libc_errno.h index 00c1f733d3..9143c841f2 100644 --- a/include/libc/libc_errno.h +++ b/include/libc/libc_errno.h @@ -13,7 +13,7 @@ #include <rtconfig.h> -#if defined(RT_USING_NEWLIB) || defined(_WIN32) || defined( __GNUC__ ) +#if defined(RT_USING_NEWLIB) || defined(_WIN32) || (defined( __GNUC__ ) && !defined(__ARMCC_VERSION)) /* use errno.h file in toolchains */ #include <errno.h> #endif @@ -45,7 +45,7 @@ defined in armcc/errno.h #define ERROR_BASE_NO 0 #endif -#if !defined(RT_USING_NEWLIB) && !defined(_WIN32) && !defined(__GNUC__ ) +#if !defined(RT_USING_NEWLIB) && !defined(_WIN32) && !(defined( __GNUC__ ) && !defined(__ARMCC_VERSION)) #define EPERM (ERROR_BASE_NO + 1) #define ENOENT (ERROR_BASE_NO + 2) |