Merge branch 'bugfix/esp_idf_version' into 'master'

Add __ASSEMBLER__ flag in esp_idf_version.h to fix build failure with assembly files

See merge request espressif/esp-idf!10855
pull/5913/merge
Angus Gratton 2020-10-16 11:04:58 +08:00
commit 3d68694962
1 zmienionych plików z 4 dodań i 0 usunięć

Wyświetl plik

@ -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