diff options
| author | Sherman <[email protected]> | 2021-11-04 13:59:22 +0800 |
|---|---|---|
| committer | Sherman <[email protected]> | 2021-11-04 13:59:22 +0800 |
| commit | 6e004d4b12993a1206c6ff0168bd602bd71e9e9b (patch) | |
| tree | 4ad5048005defe9d48c3969e875066a3ec8a9ec0 /include | |
| parent | 85934d95e6ac046ed81fc763769c60c48a42c4cb (diff) | |
| parent | 3f3418d173e5a5d3a5b9cea27da1987491bf9e6a (diff) | |
Merge branch 'master' of github.com:RT-Thread/rt-thread
Diffstat (limited to 'include')
| -rw-r--r-- | include/rtdebug.h | 13 | ||||
| -rw-r--r-- | include/rtthread.h | 2 |
2 files changed, 2 insertions, 13 deletions
diff --git a/include/rtdebug.h b/include/rtdebug.h index 8c7d450ad4..c170d148c1 100644 --- a/include/rtdebug.h +++ b/include/rtdebug.h @@ -17,18 +17,7 @@ #if !defined(RT_USING_DFS) || !defined(RT_USING_DFS_DEVFS) #error "POSIX poll/select, stdin need file system(RT_USING_DFS) and device file system(RT_USING_DFS_DEVFS)" #endif - -#if !defined(RT_USING_LIBC) -#error "POSIX layer need standard C library(RT_USING_LIBC)" -#endif - -#endif - -#ifdef RT_USING_POSIX_TERMIOS -#if !defined(RT_USING_POSIX) -#error "termios need POSIX layer(RT_USING_POSIX)" -#endif -#endif +#endif /* RT_USING_POSIX */ /* Using this macro to control all kernel debug features. */ #ifdef RT_DEBUG diff --git a/include/rtthread.h b/include/rtthread.h index cee58e402b..83be7d1ebc 100644 --- a/include/rtthread.h +++ b/include/rtthread.h @@ -596,7 +596,7 @@ rt_size_t rt_strnlen(const char *s, rt_ubase_t maxlen); #ifdef __ARMCC_VERSION /* MDK doesn't have these APIs */ char* strdup(const char* str); -size_t strnlen(const char *s, size_t maxlen); +rt_size_t strnlen(const char *s, rt_size_t maxlen); #endif /* __ARMCC_VERSION */ void rt_show_version(void); |