espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-13 01:24:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/freertos-upgrade-to-10.4.3-move-esp-header-from-FreeRTOS.h' into 'master'

Browse Source 
freertos: move esp_compiler.h include from FreeRTOS.h

Closes IDF-3720

See merge request espressif/esp-idf!15103
This commit is contained in:
Zim Kalinowski
2021-09-09 10:02:07 +00:00
parent a1c85515f6 3b40d77584
commit 917391f59f
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/freertos/include/freertos/FreeRTOS.h
View File

@@ -53,11 +53,6 @@
#endif #endif
/* *INDENT-ON* */ /* *INDENT-ON* */
#ifdef ESP_PLATFORM
/* for likely and unlikely */
#include "esp_compiler.h"
#endif // ESP_PLATFORM
/* Application specific configuration options. */ /* Application specific configuration options. */
#include "freertos/FreeRTOSConfig.h" #include "freertos/FreeRTOSConfig.h"
/* Basic FreeRTOS definitions. */ /* Basic FreeRTOS definitions. */

4
components/freertos/include/freertos/FreeRTOSConfig.h
View File

@@ -71,6 +71,10 @@
#define FREERTOS_CONFIG_H #define FREERTOS_CONFIG_H
#include "sdkconfig.h" #include "sdkconfig.h"
/* for likely and unlikely */
#include "esp_compiler.h"
// The arch-specific FreeRTOSConfig.h in port/<arch>/include. // The arch-specific FreeRTOSConfig.h in port/<arch>/include.
#include_next "freertos/FreeRTOSConfig.h" #include_next "freertos/FreeRTOSConfig.h"