arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-21 10:26:06 +03:00
Code

more bad definitions

Browse Source 
interesting that they differ in issues with 1.3 over the same source
did pvPort* change in between?
This commit is contained in:
Me No Dev 2015-12-21 14:52:56 +02:00
parent 0fd1201633
commit bcfdfb6b67
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/ESP8266WiFi/src/lwip/mem.h
View File

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

8
libraries/ESP8266WiFi/src/lwip/mem_manager.h
View File

@ -3,7 +3,7 @@
#include "c_types.h" #include "c_types.h"
/*------------------------变量定义------------------------*/ /*------------------------<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>------------------------*/
#define MPU_WRAPPERS_INCLUDED_FROM_API_FILE #define MPU_WRAPPERS_INCLUDED_FROM_API_FILE
#ifndef IOT_SIP_MODE #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 size_t xFreeBytesRemaining = ( ( size_t ) configADJUSTED_HEAP_SIZE ) & ( ( size_t ) ~portBYTE_ALIGNMENT_MASK );
/*------------------------函数声明-----------------------------------*/ /*------------------------<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-----------------------------------*/
//static void prvInsertBlockIntoFreeList( xBlockLink *pxBlockToInsert ) ;//ICACHE_FLASH_ATTR; //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 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; size_t xPortGetFreeHeapSize( void ) ;//ICACHE_FLASH_ATTR;