From 2122583ec23d82422e1e3d6f2b5a20745fa5dd6d Mon Sep 17 00:00:00 2001 From: Themba Dube Date: Sat, 7 Aug 2021 16:04:17 -0400 Subject: [PATCH] style fix usage of clang-format directives We do not use clang-format anymore, so the directive has been removed from most headers. lv_conf_template.h is untouched as a convenience for downstream projects which still use the tool. Fixes #2441 --- lv_conf_template.h | 2 +- scripts/lv_conf_internal_gen.py | 2 +- src/font/lv_symbol_def.h | 1 - src/lv_conf_internal.h | 4 ++-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lv_conf_template.h b/lv_conf_template.h index fd5698136..2ea205c1f 100644 --- a/lv_conf_template.h +++ b/lv_conf_template.h @@ -11,7 +11,7 @@ #ifndef LV_CONF_H #define LV_CONF_H -/*clang-format off*/ +/* clang-format off */ #include diff --git a/scripts/lv_conf_internal_gen.py b/scripts/lv_conf_internal_gen.py index db080dd94..0a1a72c62 100755 --- a/scripts/lv_conf_internal_gen.py +++ b/scripts/lv_conf_internal_gen.py @@ -23,7 +23,7 @@ fout.write( #ifndef LV_CONF_INTERNAL_H #define LV_CONF_INTERNAL_H -/*clang-format off*/ +/* clang-format off */ #include diff --git a/src/font/lv_symbol_def.h b/src/font/lv_symbol_def.h index 0e619e74b..75fd80b58 100644 --- a/src/font/lv_symbol_def.h +++ b/src/font/lv_symbol_def.h @@ -1,6 +1,5 @@ #ifndef LV_SYMBOL_DEF_H #define LV_SYMBOL_DEF_H -/*clang-format off*/ #ifdef __cplusplus extern "C" { diff --git a/src/lv_conf_internal.h b/src/lv_conf_internal.h index 5bcd5b1fa..fc90df207 100644 --- a/src/lv_conf_internal.h +++ b/src/lv_conf_internal.h @@ -6,7 +6,7 @@ #ifndef LV_CONF_INTERNAL_H #define LV_CONF_INTERNAL_H -/*clang-format off*/ +/* clang-format off */ #include @@ -46,7 +46,7 @@ /*---------------------------------- * Start parsing lv_conf_template.h -----------------------------------*/ -/*clang-format off*/ +/* clang-format off */ #include