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