Merge b8d21ede7c into 0ae0715ac9

event_group.c visibilty converted to public from private.
Merge pull request #1 from Selectronic-AU/feature/battries_msvc_port_fix
2025-07-04 19:37:15 -04:00 · 2025-06-16 18:14:31 +02:00 · 2025-06-13 12:42:24 +05:00 · 2025-04-01 14:23:17 +11:00 · 2025-04-01 07:13:30 +05:00
3 changed files with 12 additions and 10 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -241,7 +241,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
--- 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
--- 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>

 #ifdef __cplusplus
 extern "C" {
Author	SHA1	Message	Date
Muhammad Usman	313cd34801	Merge `b8d21ede7c` into `0ae0715ac9`	2025-06-16 18:14:31 +02:00
usman-pak1991	b8d21ede7c	event_group.c visibilty converted to public from private.	2025-06-13 12:42:24 +05:00
Ghufran Khan	b942fdaad0	Merge pull request #1 from Selectronic-AU/feature/battries_msvc_port_fix Excluding windows api from portmacro.h and adding it to port.c	2025-04-01 14:23:17 +11:00
Jauhersaeed	1973533fd4	excluding windows api from portmacro.h and adding it to port.c to avoid yeild() defined as macro in freertos-addons	2025-04-01 07:13:30 +05:00