espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 18:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
parent addabc392d c0a9ef0e1d
commit fb81c46999
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/esp_common/include/esp_idf_version.h
View File

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