From b9dd8b11729156e1f521cf74d2d1fb4543b39d99 Mon Sep 17 00:00:00 2001 From: Victor Wheeler Date: Thu, 23 Jan 2025 19:05:53 -0700 Subject: [PATCH] fix(fs_win32): fix inconsistency using LV_FS_WIN32_PATH... (#7608) --- src/libs/fsdrv/lv_fs_stdio.c | 2 +- src/libs/fsdrv/lv_fs_win32.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/libs/fsdrv/lv_fs_stdio.c b/src/libs/fsdrv/lv_fs_stdio.c index d008b247b..0ceaae2b1 100644 --- a/src/libs/fsdrv/lv_fs_stdio.c +++ b/src/libs/fsdrv/lv_fs_stdio.c @@ -7,7 +7,7 @@ * INCLUDES *********************/ #include "../../../lvgl.h" -#if LV_USE_FS_STDIO != '\0' +#if LV_USE_FS_STDIO #include #ifndef WIN32 diff --git a/src/libs/fsdrv/lv_fs_win32.c b/src/libs/fsdrv/lv_fs_win32.c index acaf2903e..ddccf6634 100644 --- a/src/libs/fsdrv/lv_fs_win32.c +++ b/src/libs/fsdrv/lv_fs_win32.c @@ -7,7 +7,7 @@ * INCLUDES *********************/ #include "../../../lvgl.h" -#if LV_USE_FS_WIN32 != '\0' +#if LV_USE_FS_WIN32 #include #include @@ -370,11 +370,7 @@ static void * fs_dir_open(lv_fs_drv_t * drv, const char * path) /*Make the path relative to the current directory (the projects root folder)*/ char buf[LV_FS_MAX_PATH_LEN]; -#ifdef LV_FS_WIN32_PATH lv_snprintf(buf, sizeof(buf), LV_FS_WIN32_PATH "%s\\*", path); -#else - lv_snprintf(buf, sizeof(buf), "%s\\*", path); -#endif lv_strcpy(handle->next_fn, ""); handle->dir_p = FindFirstFileA(buf, &fdata);