diff options
| author | David Lin <[email protected]> | 2021-06-24 22:36:14 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-06-24 22:36:14 +0800 |
| commit | 6efca1d120aa64b5345e6a0801f23c3fa0e47db4 (patch) | |
| tree | 8644973a5c0d19072a19d8d7f8ebd63dfbbed408 /include | |
| parent | 09b08cca8e5b8c728fb886abc866c22974527b6c (diff) | |
| parent | fcb0a47328a3178d02b3bc0a83bd9e84818e08b7 (diff) | |
Merge branch 'RT-Thread:master' into master
Diffstat (limited to 'include')
| -rw-r--r-- | include/libc/libc_signal.h | 2 | ||||
| -rw-r--r-- | include/rtlibc.h | 2 | ||||
| -rw-r--r-- | include/rtthread.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/libc/libc_signal.h b/include/libc/libc_signal.h index 8a4cc0d738..1fb8194643 100644 --- a/include/libc/libc_signal.h +++ b/include/libc/libc_signal.h @@ -71,7 +71,7 @@ typedef unsigned long sigset_t; #include <signal.h> -#if defined(__CC_ARM) || defined(__CLANG_ARM) +#ifdef __ARMCC_VERSION #define SIGHUP 1 /* #define SIGINT 2 */ diff --git a/include/rtlibc.h b/include/rtlibc.h index d78ec8046f..ac44a97831 100644 --- a/include/rtlibc.h +++ b/include/rtlibc.h @@ -20,7 +20,7 @@ #include "libc/libc_fdset.h" #ifndef RT_USING_LIBC -#if defined(__CC_ARM) || defined(__CLANG_ARM) || defined(__IAR_SYSTEMS_ICC__) +#if defined(__ARMCC_VERSION) || defined(__IAR_SYSTEMS_ICC__) typedef signed long off_t; typedef int mode_t; #endif diff --git a/include/rtthread.h b/include/rtthread.h index 980c4771b3..0583ce6434 100644 --- a/include/rtthread.h +++ b/include/rtthread.h @@ -566,7 +566,7 @@ rt_size_t rt_strlen(const char *src); #endif /*RT_KSERVICE_USING_STDLIB*/ char *rt_strdup(const char *s); -#if defined(__CC_ARM) || defined(__CLANG_ARM) +#ifdef __ARMCC_VERSION /* lack strdup interface */ char* strdup(const char* str); #endif |