From e4849fecdd4043cad0965ca793668cff31c6a015 Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Mon, 30 Sep 2024 15:43:39 +0100 Subject: [PATCH] chore(lv_conf_internal): avoid LV_CONF_SKIP redefinition warning (#6960) --- scripts/lv_conf_internal_gen.py | 2 +- src/lv_conf_internal.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/lv_conf_internal_gen.py b/scripts/lv_conf_internal_gen.py index dad5569cd..5cad053d6 100755 --- a/scripts/lv_conf_internal_gen.py +++ b/scripts/lv_conf_internal_gen.py @@ -54,7 +54,7 @@ fout.write( /** Handle special Kconfig options. */ #ifndef LV_KCONFIG_IGNORE #include "lv_conf_kconfig.h" - #ifdef CONFIG_LV_CONF_SKIP + #if defined(CONFIG_LV_CONF_SKIP) && !defined(LV_CONF_SKIP) #define LV_CONF_SKIP #endif #endif diff --git a/src/lv_conf_internal.h b/src/lv_conf_internal.h index 66d64b78c..e0aefaee7 100644 --- a/src/lv_conf_internal.h +++ b/src/lv_conf_internal.h @@ -32,7 +32,7 @@ /** Handle special Kconfig options. */ #ifndef LV_KCONFIG_IGNORE #include "lv_conf_kconfig.h" - #ifdef CONFIG_LV_CONF_SKIP + #if defined(CONFIG_LV_CONF_SKIP) && !defined(LV_CONF_SKIP) #define LV_CONF_SKIP #endif #endif