Explorar o código

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

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

See merge request espressif/esp-idf!10901
Mahavir Jain %!s(int64=5) %!d(string=hai) anos
pai
achega
b3c39b2d25
Modificáronse 1 ficheiros con 4 adicións e 0 borrados
  1. 4 0
      components/esp_common/include/esp_idf_version.h

+ 4 - 0
components/esp_common/include/esp_idf_version.h

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