Merge branch 'bugfix/esp_idf_version_v4.2' into 'release/v4.2'

Add __ASSEMBLER__ flag in esp_idf_version.h to fix build failure with assembly files (v4.2)

See merge request espressif/esp-idf!10899
This commit is contained in:
Angus Gratton
2020-12-08 09:07:51 +08:00

View File

@ -41,6 +41,8 @@ extern "C" {
ESP_IDF_VERSION_MINOR, \
ESP_IDF_VERSION_PATCH)
#ifndef __ASSEMBLER__
/**
* Return full IDF version string, same as 'git describe' output.
*
@ -53,6 +55,8 @@ extern "C" {
*/
const char* esp_get_idf_version(void);
#endif
#ifdef __cplusplus
}
#endif