Merge branch 'bugfix/TW#16106_esp_heap_trace.h_C++_include_guards' into 'master'
freertos/add C++ include guards for esp_heap_caps.h See merge request !1516
This commit is contained in:
commit
4468825028
1 changed files with 7 additions and 0 deletions
|
@ -17,6 +17,10 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include "multi_heap.h"
|
#include "multi_heap.h"
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Flags to indicate the capabilities of the various memory systems
|
* @brief Flags to indicate the capabilities of the various memory systems
|
||||||
*/
|
*/
|
||||||
|
@ -306,3 +310,6 @@ void heap_caps_dump(uint32_t caps);
|
||||||
*/
|
*/
|
||||||
void heap_caps_dump_all();
|
void heap_caps_dump_all();
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue