1
0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-12 01:53:07 +03:00

Merge pull request #1239 from esp8266/sdk-1.5

Update to SDK 1.5 (#1102)
This commit is contained in:
Ivan Grokhotkov
2015-12-18 09:31:00 +03:00
30 changed files with 868 additions and 23 deletions

View File

@ -51,19 +51,19 @@ typedef size_t mem_size_t;
* allow these defines to be overridden.
*/
#ifndef mem_free
#define mem_free vPortFree
#define mem_free(p) vPortFree(p, "", 0)
#endif
#ifndef mem_malloc
#define mem_malloc pvPortMalloc
#define mem_malloc(s) pvPortMalloc(s, "", 0)
#endif
#ifndef mem_calloc
#define mem_calloc pvPortCalloc
#define mem_calloc(s) pvPortCalloc(s, "", 0)
#endif
#ifndef mem_realloc
#define mem_realloc pvPortRealloc
#define mem_realloc(p, s) pvPortRealloc(p, s, "", 0)
#endif
#ifndef mem_zalloc
#define mem_zalloc pvPortZalloc
#define mem_zalloc(s) pvPortZalloc(s, "", 0)
#endif
#ifndef os_malloc