From 6e9e25506933374541ee4e51d2b97dc14ff339bf Mon Sep 17 00:00:00 2001 From: QuellaZhang <1998zhangyi@gmail.com> Date: Fri, 22 May 2026 11:32:35 +0800 Subject: [PATCH] Fix(ui): Avoid ERROR macro conflict in iconcodes --- framework/ui/view/iconcodes.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/ui/view/iconcodes.h b/framework/ui/view/iconcodes.h index bc62ac40c9..0f47a4c91c 100644 --- a/framework/ui/view/iconcodes.h +++ b/framework/ui/view/iconcodes.h @@ -31,8 +31,8 @@ #ifdef INFO #undef INFO #endif -#ifdef ERROR -#undef ERROR +#ifdef ERROR_ICON +#undef ERROR_ICON #endif #ifdef QUESTION #undef QUESTION @@ -340,7 +340,7 @@ enum class Code : char16_t { WARNING = 0xF3CE, INFO = 0xF3CF, - ERROR = 0xF3D0, + ERROR_ICON = 0xF3D0, QUESTION = 0xF3D1, MUTE = 0xF3D5,