From 1a7eb62e1d43496f91ad402589a1567aa53f5ca8 Mon Sep 17 00:00:00 2001 From: Jiang Yu Date: Fri, 4 Sep 2026 16:53:19 +0800 Subject: [PATCH] [components/drivers] reset: Fix build error when reset and ulog are both enabled. The '#define assert ASSERT' in ulog_def.h conflicts with the 'assert' used in reset.c (rstc->rstcer->ops->assert), causing unintended macro expansion. Signed-off-by: Jiang Yu --- components/drivers/reset/reset.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/components/drivers/reset/reset.c b/components/drivers/reset/reset.c index 290d2a7014e6..6928565cce48 100644 --- a/components/drivers/reset/reset.c +++ b/components/drivers/reset/reset.c @@ -14,6 +14,9 @@ #define DBG_TAG "rtdm.reset" #define DBG_LVL DBG_INFO #include +#ifdef assert +#undef assert +#endif #include #include