diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/rtthread.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/include/rtthread.h b/include/rtthread.h index 8d4f740e8c..233d9198c6 100644 --- a/include/rtthread.h +++ b/include/rtthread.h @@ -605,7 +605,8 @@ void *rt_memcpy(void *dest, const void *src, rt_ubase_t n); void *rt_memmove(void *dest, const void *src, rt_size_t n); rt_int32_t rt_memcmp(const void *cs, const void *ct, rt_size_t count); #endif /* RT_KSERVICE_USING_STDLIB_MEMORY */ - +char *rt_strdup(const char *s); +rt_size_t rt_strnlen(const char *s, rt_ubase_t maxlen); #ifndef RT_KSERVICE_USING_STDLIB char *rt_strstr(const char *str1, const char *str2); rt_int32_t rt_strcasecmp(const char *a, const char *b); @@ -631,19 +632,6 @@ rt_size_t rt_strlen(const char *src); #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 -/* MDK doesn't have these APIs */ -rt_size_t strnlen(const char *s, rt_size_t maxlen); -#endif /* __ARMCC_VERSION */ - void rt_show_version(void); #ifdef RT_DEBUG |