From 3d3f3700a8782865a65eadd24aed0de1c1ffad0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= <kuba@szczodrzynski.pl>
Date: Tue, 14 Mar 2023 13:03:34 +0100
Subject: [PATCH] [core] Update lwIP for SDK-independent headers

---
 cores/common/arduino/src/Arduino.h | 3 +++
 external-libs.json                 | 7 +++++--
 platform.json                      | 3 +--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/cores/common/arduino/src/Arduino.h b/cores/common/arduino/src/Arduino.h
index 5c392e9..3c8eb98 100644
--- a/cores/common/arduino/src/Arduino.h
+++ b/cores/common/arduino/src/Arduino.h
@@ -34,6 +34,9 @@ using std::min;
 #include "wiring_compat.h"
 #include "wiring_custom.h"
 
+// FreeRTOS kernel
+#include <FreeRTOS.h>
+
 // Define available serial ports
 #if defined(__cplusplus) && LT_ARD_HAS_SERIAL
 #include <Serial.h>
diff --git a/external-libs.json b/external-libs.json
index 5d5c4f3..4cb871b 100644
--- a/external-libs.json
+++ b/external-libs.json
@@ -67,7 +67,10 @@
 		],
 		"includes": [
 			"+<FreeRTOS/Source/include>"
-		]
+		],
+		"defines": {
+			"FREERTOS_PORT_${FREERTOS_PORT_DEFINE}": "1"
+		}
 	},
 	"freertos-port": {
 		"package": "library-freertos-port",
@@ -75,7 +78,7 @@
 			"+<./$FREERTOS_PORT/*.c>"
 		],
 		"includes": [
-			"+<./$FREERTOS_PORT>"
+			"!<./$FREERTOS_PORT>"
 		],
 		"defines": {
 			"FREERTOS_PORT_${FREERTOS_PORT_DEFINE}": "1"
diff --git a/platform.json b/platform.json
index 53bc9e4..4f032bb 100644
--- a/platform.json
+++ b/platform.json
@@ -71,8 +71,7 @@
     "library-lwip": {
       "type": "framework",
       "optional": true,
-      "base_url": "https://github.com/libretuya/lwip",
-      "version_prefix": true
+      "base_url": "https://github.com/libretuya/lwip"
     },
     "library-freertos": {
       "type": "framework",