1*4882a593SmuzhiyunFrom 0f2e4a6908a80f4f3f7dc3463410450e2f0c2c71 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Jiajian Wu <jair.wu@rock-chips.com> 3*4882a593SmuzhiyunDate: Wed, 26 Apr 2023 16:43:30 +0800 4*4882a593SmuzhiyunSubject: [PATCH 1/4] src: lv_span: fix conflicting function definitions 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunSigned-off-by: Jiajian Wu <jair.wu@rock-chips.com> 7*4882a593Smuzhiyun--- 8*4882a593Smuzhiyun src/extra/widgets/span/lv_span.c | 2 +- 9*4882a593Smuzhiyun 1 file changed, 1 insertion(+), 1 deletion(-) 10*4882a593Smuzhiyun 11*4882a593Smuzhiyundiff --git a/src/extra/widgets/span/lv_span.c b/src/extra/widgets/span/lv_span.c 12*4882a593Smuzhiyunindex 96f044760..ef0840d35 100644 13*4882a593Smuzhiyun--- a/src/extra/widgets/span/lv_span.c 14*4882a593Smuzhiyun+++ b/src/extra/widgets/span/lv_span.c 15*4882a593Smuzhiyun@@ -48,7 +48,7 @@ static const lv_font_t * lv_span_get_style_text_font(lv_obj_t * par, lv_span_t * 16*4882a593Smuzhiyun static lv_coord_t lv_span_get_style_text_letter_space(lv_obj_t * par, lv_span_t * span); 17*4882a593Smuzhiyun static lv_color_t lv_span_get_style_text_color(lv_obj_t * par, lv_span_t * span); 18*4882a593Smuzhiyun static lv_opa_t lv_span_get_style_text_opa(lv_obj_t * par, lv_span_t * span); 19*4882a593Smuzhiyun-static lv_opa_t lv_span_get_style_text_blend_mode(lv_obj_t * par, lv_span_t * span); 20*4882a593Smuzhiyun+static lv_blend_mode_t lv_span_get_style_text_blend_mode(lv_obj_t * par, lv_span_t * span); 21*4882a593Smuzhiyun static int32_t lv_span_get_style_text_decor(lv_obj_t * par, lv_span_t * span); 22*4882a593Smuzhiyun 23*4882a593Smuzhiyun static inline void span_text_check(const char ** text); 24*4882a593Smuzhiyun-- 25*4882a593Smuzhiyun2.25.1 26*4882a593Smuzhiyun 27