From 998ad66c84258e5638ef5e3669934a481c3615f6 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Tue, 5 Jan 2021 15:46:57 +0100 Subject: [PATCH] fix(kconfig): fix redefinition of LV_SPRINTF_DISABLE_FLOAT if no Kconfig --- src/lv_conf_kconfig.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/lv_conf_kconfig.h b/src/lv_conf_kconfig.h index 289e581f2..075d1da1e 100644 --- a/src/lv_conf_kconfig.h +++ b/src/lv_conf_kconfig.h @@ -404,12 +404,14 @@ extern "C" { * SPRINTF DISABLE FLOAT *-----------------*/ -#ifndef LV_SPRINTF_DISABLE_FLOAT -#ifndef CONFIG_LV_SPRINTF_DISABLE_FLOAT -#define LV_SPRINTF_DISABLE_FLOAT 0 -#else -#define LV_SPRINTF_DISABLE_FLOAT 1 -#endif +#if CONFIG_LV_CONF_SKIP || LV_CONF_SKIP +# ifndef LV_SPRINTF_DISABLE_FLOAT +# ifndef CONFIG_LV_SPRINTF_DISABLE_FLOAT +# define LV_SPRINTF_DISABLE_FLOAT 0 +# else +# define LV_SPRINTF_DISABLE_FLOAT 1 +# endif +# endif #endif #ifdef __cplusplus