github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(lv_conf_internal): avoid LV_CONF_SKIP redefinition warning (#6960)

Browse Source
This commit is contained in:
Gleb Mazovetskiy
2024-09-30 15:43:39 +01:00
committed by GitHub
parent 2601a26c7f
commit e4849fecdd
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/lv_conf_internal_gen.py
View File

@@ -54,7 +54,7 @@ fout.write(
/** Handle special Kconfig options. */ /** Handle special Kconfig options. */
#ifndef LV_KCONFIG_IGNORE #ifndef LV_KCONFIG_IGNORE
#include "lv_conf_kconfig.h" #include "lv_conf_kconfig.h"
#ifdef CONFIG_LV_CONF_SKIP #if defined(CONFIG_LV_CONF_SKIP) && !defined(LV_CONF_SKIP)
#define LV_CONF_SKIP #define LV_CONF_SKIP
#endif #endif
#endif #endif

2
src/lv_conf_internal.h
View File

@@ -32,7 +32,7 @@
/** Handle special Kconfig options. */ /** Handle special Kconfig options. */
#ifndef LV_KCONFIG_IGNORE #ifndef LV_KCONFIG_IGNORE
#include "lv_conf_kconfig.h" #include "lv_conf_kconfig.h"
#ifdef CONFIG_LV_CONF_SKIP #if defined(CONFIG_LV_CONF_SKIP) && !defined(LV_CONF_SKIP)
#define LV_CONF_SKIP #define LV_CONF_SKIP
#endif #endif
#endif #endif