From 4827831107eed44def0eb1ed7f06aafc5bf61a26 Mon Sep 17 00:00:00 2001
From: "Sergio R. Caprile" <scaprile@cesanta.com>
Date: Thu, 23 Mar 2023 17:13:02 -0300
Subject: [PATCH] Let FreeRTOS-Plus-TCP build on Keil

---
 mongoose.h   | 25 ++++++++++++-------------
 src/net_ft.h | 25 ++++++++++++-------------
 2 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/mongoose.h b/mongoose.h
index 7bef05b6..3e0c3662 100644
--- a/mongoose.h
+++ b/mongoose.h
@@ -516,24 +516,12 @@ int sscanf(const char *, const char *, ...);
 
 #if defined(MG_ENABLE_FREERTOS_TCP) && MG_ENABLE_FREERTOS_TCP
 
-#include <ctype.h>
-#include <errno.h>
 #include <limits.h>
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <time.h>
-
-#include <FreeRTOS.h>
 #include <list.h>
-#include <task.h>
 
 #include <FreeRTOS_IP.h>
 #include <FreeRTOS_Sockets.h>
+#include <FreeRTOS_errno_TCP.h>  // contents to be moved and file removed, some day
 
 #define MG_SOCKET_TYPE Socket_t
 #define MG_INVALID_SOCKET FREERTOS_INVALID_SOCKET
@@ -549,6 +537,17 @@ int sscanf(const char *, const char *, ...);
 #define SO_ERROR 0
 #define SOL_SOCKET 0
 #define SO_REUSEADDR 0
+#undef EINTR
+#undef EWOULDBLOCK
+#undef EINPROGRESS
+#undef EPIPE
+#undef ECONNRESET
+#define EINTR pdFREERTOS_ERRNO_EINTR
+#define EWOULDBLOCK pdFREERTOS_ERRNO_EWOULDBLOCK
+#define EINPROGRESS pdFREERTOS_ERRNO_EINPROGRESS
+#define EPIPE 0
+#define ECONNRESET 0
+#define EINTR pdFREERTOS_ERRNO_EINTR
 #define sockaddr_in freertos_sockaddr
 #define sockaddr freertos_sockaddr
 #define accept(a, b, c) FreeRTOS_accept((a), (b), (c))
diff --git a/src/net_ft.h b/src/net_ft.h
index 0c43ea07..3fa9905c 100644
--- a/src/net_ft.h
+++ b/src/net_ft.h
@@ -2,24 +2,12 @@
 
 #if defined(MG_ENABLE_FREERTOS_TCP) && MG_ENABLE_FREERTOS_TCP
 
-#include <ctype.h>
-#include <errno.h>
 #include <limits.h>
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <time.h>
-
-#include <FreeRTOS.h>
 #include <list.h>
-#include <task.h>
 
 #include <FreeRTOS_IP.h>
 #include <FreeRTOS_Sockets.h>
+#include <FreeRTOS_errno_TCP.h>  // contents to be moved and file removed, some day
 
 #define MG_SOCKET_TYPE Socket_t
 #define MG_INVALID_SOCKET FREERTOS_INVALID_SOCKET
@@ -35,6 +23,17 @@
 #define SO_ERROR 0
 #define SOL_SOCKET 0
 #define SO_REUSEADDR 0
+#undef EINTR
+#undef EWOULDBLOCK
+#undef EINPROGRESS
+#undef EPIPE
+#undef ECONNRESET
+#define EINTR pdFREERTOS_ERRNO_EINTR
+#define EWOULDBLOCK pdFREERTOS_ERRNO_EWOULDBLOCK
+#define EINPROGRESS pdFREERTOS_ERRNO_EINPROGRESS
+#define EPIPE 0
+#define ECONNRESET 0
+#define EINTR pdFREERTOS_ERRNO_EINTR
 #define sockaddr_in freertos_sockaddr
 #define sockaddr freertos_sockaddr
 #define accept(a, b, c) FreeRTOS_accept((a), (b), (c))