From f393629c2a92047181eca2bc8ccc91ba4f2ce082 Mon Sep 17 00:00:00 2001 From: Victor Wheeler Date: Fri, 3 Jan 2025 14:36:42 -0700 Subject: [PATCH] fix(lv_freetype): clean up includes (#7524) --- src/libs/freetype/lv_freetype.c | 3 +-- src/libs/freetype/lv_freetype.h | 9 +++++---- src/libs/freetype/lv_freetype_private.h | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/libs/freetype/lv_freetype.c b/src/libs/freetype/lv_freetype.c index 94df703cd..c6edfb807 100755 --- a/src/libs/freetype/lv_freetype.c +++ b/src/libs/freetype/lv_freetype.c @@ -6,12 +6,11 @@ /********************* * INCLUDES *********************/ -#include "../../misc/lv_fs_private.h" #include "lv_freetype_private.h" #if LV_USE_FREETYPE -#include "lv_freetype_private.h" +#include "../../misc/lv_fs_private.h" #include "../../core/lv_global.h" /********************* diff --git a/src/libs/freetype/lv_freetype.h b/src/libs/freetype/lv_freetype.h index 76b9f7b56..6fe3a8f94 100755 --- a/src/libs/freetype/lv_freetype.h +++ b/src/libs/freetype/lv_freetype.h @@ -13,15 +13,16 @@ extern "C" { * INCLUDES *********************/ #include "../../lv_conf_internal.h" + +#if LV_USE_FREETYPE + #include "../../misc/lv_types.h" #include "../../misc/lv_event.h" #include LV_STDBOOL_INCLUDE -#if LV_USE_FREETYPE - /********************* - * DEFINES - *********************/ +* DEFINES +*********************/ #define LV_FREETYPE_F26DOT6_TO_INT(x) ((x) >> 6) #define LV_FREETYPE_F26DOT6_TO_FLOAT(x) ((float)(x) / 64) diff --git a/src/libs/freetype/lv_freetype_private.h b/src/libs/freetype/lv_freetype_private.h index bb832d04c..54db33682 100755 --- a/src/libs/freetype/lv_freetype_private.h +++ b/src/libs/freetype/lv_freetype_private.h @@ -15,12 +15,12 @@ extern "C" { *********************/ #include "lv_freetype.h" -#include "../../misc/cache/lv_cache.h" -#include "../../misc/lv_ll.h" -#include "../../font/lv_font.h" #if LV_USE_FREETYPE +#include "../../misc/cache/lv_cache.h" +#include "../../misc/lv_ll.h" +#include "../../font/lv_font.h" #include "ft2build.h" #include FT_FREETYPE_H #include FT_GLYPH_H