diff options
| author | liukangcc <[email protected]> | 2021-09-17 15:03:14 +0800 |
|---|---|---|
| committer | liukangcc <[email protected]> | 2021-09-17 15:03:14 +0800 |
| commit | 4b3df6010f7870aebcd1df20bbaabd5fe9212c6d (patch) | |
| tree | 95b0e12447425f803be46d16eaf6e7188c364fec /components/utilities | |
| parent | f07507a91310bc5696a08f5bbf6ab8679cfbcf73 (diff) | |
| parent | ef71de34f76d4403fcd2cddd21a17f3a53a40296 (diff) | |
Merge remote-tracking branch 'remotes/rtt_github/master'
Diffstat (limited to 'components/utilities')
| -rw-r--r-- | components/utilities/rt-link/src/rtlink_dev.c | 2 | ||||
| -rw-r--r-- | components/utilities/ulog/ulog.c | 2 | ||||
| -rw-r--r-- | components/utilities/utest/utest_assert.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/components/utilities/rt-link/src/rtlink_dev.c b/components/utilities/rt-link/src/rtlink_dev.c index 5eff1f9782..efebf37565 100644 --- a/components/utilities/rt-link/src/rtlink_dev.c +++ b/components/utilities/rt-link/src/rtlink_dev.c @@ -21,7 +21,7 @@ #ifdef RT_USING_POSIX #include <dfs_posix.h> -#include <dfs_poll.h> +#include <poll.h> int rtlink_fops_open(struct dfs_fd *fd) { diff --git a/components/utilities/ulog/ulog.c b/components/utilities/ulog/ulog.c index 89ba58cf48..0e227e39f3 100644 --- a/components/utilities/ulog/ulog.c +++ b/components/utilities/ulog/ulog.c @@ -1075,7 +1075,7 @@ const char *ulog_global_filter_kw_get(void) return ulog.filter.keyword; } -#ifdef(RT_USING_FINSH) +#ifdef RT_USING_FINSH #include <finsh.h> static void _print_lvl_info(void) diff --git a/components/utilities/utest/utest_assert.h b/components/utilities/utest/utest_assert.h index 2e2007e773..ba76fc39ee 100644 --- a/components/utilities/utest/utest_assert.h +++ b/components/utilities/utest/utest_assert.h @@ -50,8 +50,8 @@ void utest_assert_buf(const char *a, const char *b, rt_size_t sz, rt_bool_t equa */ #define uassert_true(value) __utest_assert(value, "(" #value ") is false") #define uassert_false(value) __utest_assert(!(value), "(" #value ") is true") -#define uassert_null(value) __utest_assert((const char *)(value) == NULL, "(" #value ") is not null") -#define uassert_not_null(value) __utest_assert((const char *)(value) != NULL, "(" #value ") is null") +#define uassert_null(value) __utest_assert((const char *)(value) == RT_NULL, "(" #value ") is not null") +#define uassert_not_null(value) __utest_assert((const char *)(value) != RT_NULL, "(" #value ") is null") #define uassert_int_equal(a, b) __utest_assert((a) == (b), "(" #a ") not equal to (" #b ")") #define uassert_int_not_equal(a, b) __utest_assert((a) != (b), "(" #a ") equal to (" #b ")") |