diff options
| author | Meco Man <[email protected]> | 2021-10-11 16:02:46 -0400 |
|---|---|---|
| committer | Meco Man <[email protected]> | 2021-10-12 21:47:57 -0400 |
| commit | 663991897bbd2ae20098747fd79c57e0d42c70c0 (patch) | |
| tree | 100cd9661aedf761ac3d991850712ef465642375 /include | |
| parent | 277bb736d7d4a7e6c32df107e550c2918bf95726 (diff) | |
fixed bug #5138
Diffstat (limited to 'include')
| -rw-r--r-- | include/rtthread.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/include/rtthread.h b/include/rtthread.h index 1be5fda82d..cee58e402b 100644 --- a/include/rtthread.h +++ b/include/rtthread.h @@ -564,6 +564,7 @@ int __rt_ffs(int value); void *rt_memset(void *src, int c, rt_ubase_t n); void *rt_memcpy(void *dest, const void *src, rt_ubase_t n); +char *rt_strdup(const char *s); #ifndef RT_KSERVICE_USING_STDLIB void *rt_memmove(void *dest, const void *src, rt_ubase_t n); @@ -573,7 +574,6 @@ rt_int32_t rt_strcasecmp(const char *a, const char *b); char *rt_strncpy(char *dest, const char *src, rt_ubase_t n); rt_int32_t rt_strncmp(const char *cs, const char *ct, rt_ubase_t count); rt_int32_t rt_strcmp(const char *cs, const char *ct); -rt_size_t rt_strnlen(const char *s, rt_ubase_t maxlen); rt_size_t rt_strlen(const char *src); #else #include <string.h> @@ -584,15 +584,20 @@ rt_size_t rt_strlen(const char *src); #define rt_strncpy(dest, src, n) strncpy(dest, src, n) #define rt_strncmp(cs, ct, count) strncmp(cs, ct, count) #define rt_strcmp(cs, ct) strcmp(cs, ct) -#define rt_strnlen(s, maxlen) strnlen(s, maxlen) #define rt_strlen(src) strlen(src) #endif /*RT_KSERVICE_USING_STDLIB*/ -char *rt_strdup(const char *s); +#if !defined(RT_KSERVICE_USING_STDLIB) || defined(__ARMCC_VERSION) +rt_size_t rt_strnlen(const char *s, rt_ubase_t maxlen); +#else +#define rt_strnlen(s, maxlen) strnlen(s, maxlen) +#endif /* !defined(RT_KSERVICE_USING_STDLIB) || defined(__ARMCC_VERSION) */ + #ifdef __ARMCC_VERSION -/* lack strdup interface */ +/* MDK doesn't have these APIs */ char* strdup(const char* str); -#endif +size_t strnlen(const char *s, size_t maxlen); +#endif /* __ARMCC_VERSION */ void rt_show_version(void); |