From 5f948690c9b2190c8a237bdfc0e67f4d68f4efd6 Mon Sep 17 00:00:00 2001 From: Meco Man <920369182@qq.com> Date: Mon, 4 Sep 2023 14:17:11 -0400 Subject: [PATCH] [rtdef] rename RT_CTASSERT to RT_STATIC_ASSERT --- components/lwp/lwp_signal.c | 2 +- components/lwp/lwp_syscall.c | 2 +- components/mm/mm_page.c | 4 ++-- include/rtdef.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/components/lwp/lwp_signal.c b/components/lwp/lwp_signal.c index c6296042f9..5ac08589e9 100644 --- a/components/lwp/lwp_signal.c +++ b/components/lwp/lwp_signal.c @@ -310,7 +310,7 @@ static void sigqueue_discard(lwp_sigqueue_t sigqueue, int signo) } /* assuming that (void *) is compatible to long at length */ -RT_CTASSERT(lp_width_same, sizeof(void *) == sizeof(long)); +RT_STATIC_ASSERT(lp_width_same, sizeof(void *) == sizeof(long)); /** translate lwp siginfo to user siginfo_t */ rt_inline void siginfo_k2u(lwp_siginfo_t ksigi, siginfo_t *usigi) diff --git a/components/lwp/lwp_syscall.c b/components/lwp/lwp_syscall.c index 8f7a3c3c26..a8bab891f4 100644 --- a/components/lwp/lwp_syscall.c +++ b/components/lwp/lwp_syscall.c @@ -1378,7 +1378,7 @@ struct ksigevent }; /* to protect unsafe implementation in current rt-smart toolchain */ -RT_CTASSERT(sigevent_compatible, offsetof(struct ksigevent, sigev_tid) == offsetof(struct sigevent, sigev_notify_function)); +RT_STATIC_ASSERT(sigevent_compatible, offsetof(struct ksigevent, sigev_tid) == offsetof(struct sigevent, sigev_notify_function)); sysret_t sys_timer_create(clockid_t clockid, struct sigevent *restrict sevp, timer_t *restrict timerid) { diff --git a/components/mm/mm_page.c b/components/mm/mm_page.c index da790056f9..99110ab435 100644 --- a/components/mm/mm_page.c +++ b/components/mm/mm_page.c @@ -27,8 +27,8 @@ #define DBG_LVL DBG_WARNING #include -RT_CTASSERT(order_huge_pg, RT_PAGE_MAX_ORDER > ARCH_PAGE_SHIFT - 2); -RT_CTASSERT(size_width, sizeof(rt_size_t) == sizeof(void *)); +RT_STATIC_ASSERT(order_huge_pg, RT_PAGE_MAX_ORDER > ARCH_PAGE_SHIFT - 2); +RT_STATIC_ASSERT(size_width, sizeof(rt_size_t) == sizeof(void *)); #ifdef RT_USING_SMART #include "lwp_arch_comm.h" diff --git a/include/rtdef.h b/include/rtdef.h index 1966595ced..dd33473123 100644 --- a/include/rtdef.h +++ b/include/rtdef.h @@ -180,7 +180,7 @@ typedef rt_base_t rt_off_t; /**< Type for offset */ #define RT_UNUSED(x) ((void)x) /* compile time assertion */ -#define RT_CTASSERT(name, expn) typedef char _ct_assert_##name[(expn)?1:-1] +#define RT_STATIC_ASSERT(name, expn) typedef char _static_assert_##name[(expn)?1:-1] /* Compiler Related Definitions */ #if defined(__ARMCC_VERSION) /* ARM Compiler */