From bcfdfb6b67f92c72b26352ee6821bba90b25ac93 Mon Sep 17 00:00:00 2001 From: Me No Dev Date: Mon, 21 Dec 2015 14:52:56 +0200 Subject: [PATCH] more bad definitions interesting that they differ in issues with 1.3 over the same source did pvPort* change in between? --- libraries/ESP8266WiFi/src/lwip/mem.h | 10 +++++----- libraries/ESP8266WiFi/src/lwip/mem_manager.h | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libraries/ESP8266WiFi/src/lwip/mem.h b/libraries/ESP8266WiFi/src/lwip/mem.h index ed58aa47f..1d768856c 100644 --- a/libraries/ESP8266WiFi/src/lwip/mem.h +++ b/libraries/ESP8266WiFi/src/lwip/mem.h @@ -51,19 +51,19 @@ typedef size_t mem_size_t; * allow these defines to be overridden. */ #ifndef mem_free -#define mem_free(p) vPortFree(p) +#define mem_free(p) vPortFree(p, "", 0) #endif #ifndef mem_malloc -#define mem_malloc(s) pvPortMalloc(s) +#define mem_malloc(s) pvPortMalloc(s, "", 0) #endif #ifndef mem_calloc -#define mem_calloc(s) pvPortCalloc(s) +#define mem_calloc(s) pvPortCalloc(s, "", 0) #endif #ifndef mem_realloc -#define mem_realloc(p, s) pvPortRealloc(p, s) +#define mem_realloc(p, s) pvPortRealloc(p, s, "", 0) #endif #ifndef mem_zalloc -#define mem_zalloc(s) pvPortZalloc(s) +#define mem_zalloc(s) pvPortZalloc(s, "", 0) #endif #ifndef os_malloc diff --git a/libraries/ESP8266WiFi/src/lwip/mem_manager.h b/libraries/ESP8266WiFi/src/lwip/mem_manager.h index 035596891..58c2a02ae 100644 --- a/libraries/ESP8266WiFi/src/lwip/mem_manager.h +++ b/libraries/ESP8266WiFi/src/lwip/mem_manager.h @@ -3,7 +3,7 @@ #include "c_types.h" -/*------------------------±äÁ¿¶¨Òå------------------------*/ +/*------------------------��������------------------------*/ #define MPU_WRAPPERS_INCLUDED_FROM_API_FILE #ifndef IOT_SIP_MODE @@ -61,7 +61,7 @@ static const unsigned short heapSTRUCT_SIZE = ( sizeof( xBlockLink ) + portBYTE_ //static size_t xFreeBytesRemaining = ( ( size_t ) configADJUSTED_HEAP_SIZE ) & ( ( size_t ) ~portBYTE_ALIGNMENT_MASK ); -/*------------------------º¯ÊýÉùÃ÷-----------------------------------*/ +/*------------------------��������-----------------------------------*/ //static void prvInsertBlockIntoFreeList( xBlockLink *pxBlockToInsert ) ;//ICACHE_FLASH_ATTR; @@ -69,9 +69,9 @@ static const unsigned short heapSTRUCT_SIZE = ( sizeof( xBlockLink ) + portBYTE_ void vApplicationMallocFailedHook( void ) ;//ICACHE_FLASH_ATTR; -void *pvPortMalloc( size_t xWantedSize ) ;//ICACHE_FLASH_ATTR; +//void *pvPortMalloc( size_t xWantedSize ) ;//ICACHE_FLASH_ATTR; -void vPortFree( void *pv ) ;//ICACHE_FLASH_ATTR; +//void vPortFree( void *pv ) ;//ICACHE_FLASH_ATTR; size_t xPortGetFreeHeapSize( void ) ;//ICACHE_FLASH_ATTR;