From 1973533fd45d30876923667031c3f9d0c069dfa1 Mon Sep 17 00:00:00 2001
From: Jauhersaeed <jauhersaeed@gmail.com>
Date: Tue, 1 Apr 2025 07:13:30 +0500
Subject: [PATCH 1/3] excluding windows api from portmacro.h and adding it to
 port.c to avoid yeild() defined as macro in freertos-addons

---
 portable/MSVC-MingW/port.c      | 11 +++++++++++
 portable/MSVC-MingW/portmacro.h |  9 ---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/portable/MSVC-MingW/port.c b/portable/MSVC-MingW/port.c
index 0a0fba6a3..0cbe2a4d8 100644
--- a/portable/MSVC-MingW/port.c
+++ b/portable/MSVC-MingW/port.c
@@ -33,6 +33,17 @@
 #include "FreeRTOS.h"
 #include "task.h"
 
+#ifdef WIN32_LEAN_AND_MEAN
+    #include <winsock2.h>
+#else
+    #include <winsock.h>
+#endif
+
+#include <windows.h>
+#include <timeapi.h>
+#include <mmsystem.h>
+#include <winbase.h>
+
 #ifdef __GNUC__
     #include "mmsystem.h"
 #else
diff --git a/portable/MSVC-MingW/portmacro.h b/portable/MSVC-MingW/portmacro.h
index 48a8bf4b0..4a824b5ae 100644
--- a/portable/MSVC-MingW/portmacro.h
+++ b/portable/MSVC-MingW/portmacro.h
@@ -29,16 +29,7 @@
 #ifndef PORTMACRO_H
 #define PORTMACRO_H
 
-#ifdef WIN32_LEAN_AND_MEAN
-    #include <winsock2.h>
-#else
-    #include <winsock.h>
-#endif
 
-#include <windows.h>
-#include <timeapi.h>
-#include <mmsystem.h>
-#include <winbase.h>
 
 /******************************************************************************
 *   Defines

From b8d21ede7cbf80bf13696b363c7daaf06981b875 Mon Sep 17 00:00:00 2001
From: usman-pak1991 <usman.pak@outlook.com>
Date: Fri, 13 Jun 2025 12:42:24 +0500
Subject: [PATCH 2/3] event_group.c visibilty converted to public from private.

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5323ec19b..018e10b5d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -236,7 +236,7 @@ add_library(freertos_kernel STATIC)
 add_subdirectory(include)
 add_subdirectory(portable)
 
-target_sources(freertos_kernel PRIVATE
+target_sources(freertos_kernel PUBLIC
     croutine.c
     event_groups.c
     list.c

From 2da35debfda2a41a8b5b5b5154458d596e8ea4d2 Mon Sep 17 00:00:00 2001
From: Gaurav-Aggarwal-AWS <33462878+aggarg@users.noreply.github.com>
Date: Thu, 31 Jul 2025 08:02:23 +0530
Subject: [PATCH 3/3] Add missing cast to BaseType_t (#1301)

Signed-off-by: Gaurav Aggarwal <aggarg@amazon.com>
---
 tasks.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasks.c b/tasks.c
index 24cfb2620..1e6ecdc9e 100644
--- a/tasks.c
+++ b/tasks.c
@@ -893,7 +893,7 @@ static void prvAddNewTaskToReadyList( TCB_t * pxNewTCB ) PRIVILEGED_FUNCTION;
         BaseType_t xCurrentCoreTaskPriority;
         BaseType_t xLowestPriorityCore = ( BaseType_t ) -1;
         BaseType_t xCoreID;
-        const BaseType_t xCurrentCoreID = portGET_CORE_ID();
+        const BaseType_t xCurrentCoreID = ( BaseType_t ) portGET_CORE_ID();
 
         #if ( configRUN_MULTIPLE_PRIORITIES == 0 )
             BaseType_t xYieldCount = 0;