arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-23 19:21:59 +03:00
Code Activity

Fix error when umm_malloc.h is included from sketch (#1652)

Browse Source
This commit is contained in:
Ivan Grokhotkov
2016-02-19 14:17:09 +03:00
parent 55e5bdfc6c
commit 103b5811be
4 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cores/esp8266/umm_malloc/umm_malloc.h
View File

@ -12,6 +12,10 @@
#include "umm_malloc_cfg.h" /* user-dependent */ #include "umm_malloc_cfg.h" /* user-dependent */
#ifdef __cplusplus
extern "C" {
#endif
typedef struct UMM_HEAP_INFO_t { typedef struct UMM_HEAP_INFO_t {
unsigned short int totalEntries; unsigned short int totalEntries;
unsigned short int usedEntries; unsigned short int usedEntries;
@ -38,6 +42,9 @@ void umm_free( void *ptr );
size_t umm_free_heap_size( void ); size_t umm_free_heap_size( void );
#ifdef __cplusplus
}
#endif
/* ------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------ */

2
cores/esp8266/umm_malloc/umm_malloc_cfg.h
View File

@ -7,7 +7,7 @@
#include <debug.h> #include <debug.h>
#ifdef __cplusplus #ifdef __cplusplus
#extern "C" { extern "C" {
#endif #endif
#include "c_types.h" #include "c_types.h"
#ifdef __cplusplus #ifdef __cplusplus

3
tests/.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
hardware
tmp
.env

13
tests/test_umm_malloc/test_umm_malloc.ino Normal file
View File

@ -0,0 +1,13 @@
// test that we can include umm_malloc.h from sketch (#1652)
#include <umm_malloc/umm_malloc.h>
void setup() {
Serial.begin(115200);
delay(1000);
umm_info(NULL, 1);
}
void loop() {
}