From 8c5e36b4ec2ceef99ca4c26dd657bd03f9922630 Mon Sep 17 00:00:00 2001
From: jas <1790731762@qq.com>
Date: Mon, 18 Mar 2024 00:15:22 +0800
Subject: [PATCH] =?UTF-8?q?[zhoulongyu]:=20ipc=E5=B7=A5=E7=A8=8B=20?=
 =?UTF-8?q?=E9=80=82=E9=85=8Dlvgl=E6=A8=A1=E6=8B=9F=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lv_drivers/display/monitor.h            | 4 ++--
 lv_drivers/indev/keyboard.h             | 2 +-
 lv_drivers/indev/mouse.h                | 2 +-
 lv_drivers/indev/mousewheel.h           | 2 +-
 lvgl/src/extra/libs/fsdrv/lv_fs_posix.c | 1 +
 main/src/mouse_cursor_icon.c            | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lv_drivers/display/monitor.h b/lv_drivers/display/monitor.h
index 6ef4d6d..c355285 100644
--- a/lv_drivers/display/monitor.h
+++ b/lv_drivers/display/monitor.h
@@ -6,7 +6,7 @@
 #ifndef MONITOR_H
 #define MONITOR_H
 
-#ifdef __cplusplus
+#ifdef __cplusplus[]
 extern "C" {
 #endif
 
@@ -26,7 +26,7 @@ extern "C" {
 #ifdef LV_LVGL_H_INCLUDE_SIMPLE
 #include "lvgl.h"
 #else
-#include "lvgl/lvgl.h"
+#include "../../lvgl/lvgl.h"
 #endif
 
 /*********************
diff --git a/lv_drivers/indev/keyboard.h b/lv_drivers/indev/keyboard.h
index 50afd1d..41e7554 100644
--- a/lv_drivers/indev/keyboard.h
+++ b/lv_drivers/indev/keyboard.h
@@ -26,7 +26,7 @@ extern "C" {
 #ifdef LV_LVGL_H_INCLUDE_SIMPLE
 #include "lvgl.h"
 #else
-#include "lvgl/lvgl.h"
+#include "../../lvgl/lvgl.h"
 #endif
 
 #ifndef MONITOR_SDL_INCLUDE_PATH
diff --git a/lv_drivers/indev/mouse.h b/lv_drivers/indev/mouse.h
index 5e56f49..f4b1bba 100644
--- a/lv_drivers/indev/mouse.h
+++ b/lv_drivers/indev/mouse.h
@@ -26,7 +26,7 @@ extern "C" {
 #ifdef LV_LVGL_H_INCLUDE_SIMPLE
 #include "lvgl.h"
 #else
-#include "lvgl/lvgl.h"
+#include "../../lvgl/lvgl.h"
 #endif
 
 #ifndef MONITOR_SDL_INCLUDE_PATH
diff --git a/lv_drivers/indev/mousewheel.h b/lv_drivers/indev/mousewheel.h
index 3103c36..23965b0 100644
--- a/lv_drivers/indev/mousewheel.h
+++ b/lv_drivers/indev/mousewheel.h
@@ -26,7 +26,7 @@ extern "C" {
 #ifdef LV_LVGL_H_INCLUDE_SIMPLE
 #include "lvgl.h"
 #else
-#include "lvgl/lvgl.h"
+#include "../../lvgl/lvgl.h"
 #endif
 
 #ifndef MONITOR_SDL_INCLUDE_PATH
diff --git a/lvgl/src/extra/libs/fsdrv/lv_fs_posix.c b/lvgl/src/extra/libs/fsdrv/lv_fs_posix.c
index e656288..2d438c3 100644
--- a/lvgl/src/extra/libs/fsdrv/lv_fs_posix.c
+++ b/lvgl/src/extra/libs/fsdrv/lv_fs_posix.c
@@ -261,6 +261,7 @@ static lv_fs_res_t fs_dir_read(lv_fs_drv_t * drv, void * dir_p, char * fn)
     do {
         entry = readdir(dir_p);
         if(entry) {
+           #define DT_DIR  4
             if(entry->d_type == DT_DIR) sprintf(fn, "/%s", entry->d_name);
             else strcpy(fn, entry->d_name);
         }
diff --git a/main/src/mouse_cursor_icon.c b/main/src/mouse_cursor_icon.c
index cf82f01..e99ee79 100644
--- a/main/src/mouse_cursor_icon.c
+++ b/main/src/mouse_cursor_icon.c
@@ -1,4 +1,4 @@
-#include "lvgl/lvgl.h"
+#include "../../lvgl/lvgl.h"
 
 const uint8_t mouse_cursor_icon_map[] = {
 #if LV_COLOR_DEPTH == 1 || LV_COLOR_DEPTH == 8