mirror of
https://github.com/FreeRTOS/FreeRTOS-Kernel.git
synced 2025-07-04 11:27:16 -04:00
Merge b8d21ede7c
into 7225fbcbb9
This commit is contained in:
commit
605efbd315
|
@ -241,7 +241,7 @@ add_library(freertos_kernel STATIC)
|
||||||
add_subdirectory(include)
|
add_subdirectory(include)
|
||||||
add_subdirectory(portable)
|
add_subdirectory(portable)
|
||||||
|
|
||||||
target_sources(freertos_kernel PRIVATE
|
target_sources(freertos_kernel PUBLIC
|
||||||
croutine.c
|
croutine.c
|
||||||
event_groups.c
|
event_groups.c
|
||||||
list.c
|
list.c
|
||||||
|
|
|
@ -33,6 +33,17 @@
|
||||||
#include "FreeRTOS.h"
|
#include "FreeRTOS.h"
|
||||||
#include "task.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__
|
#ifdef __GNUC__
|
||||||
#include "mmsystem.h"
|
#include "mmsystem.h"
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -29,16 +29,7 @@
|
||||||
#ifndef PORTMACRO_H
|
#ifndef PORTMACRO_H
|
||||||
#define 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
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
|
Loading…
Reference in a new issue