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

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
commit 917391f59f
2 changed files with 4 additions and 5 deletions

View File

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

View File

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