espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-05-22 01:27:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/examples_compile_issue_due_to_redefine' into 'master'

Browse Source 
fix(lwip): Fix definition conflict

See merge request sdk/ESP8266_RTOS_SDK!127
This commit is contained in:
Wu Jian Gang
2018-05-04 13:53:16 +08:00
parent b43444081c e9308e6266
commit cfe86e9cc8
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/lwip/include/lwip/port/lwipopts.h
View File

@ -46,6 +46,7 @@
#include "sdkconfig.h" #include "sdkconfig.h"
#include <stddef.h> #include <stddef.h>
#include <stdbool.h>
#include "esp_libc.h" #include "esp_libc.h"
//#define SOCKETS_MT //#define SOCKETS_MT
@ -193,7 +194,7 @@
/** /**
* Use DRAM instead of IRAM * Use DRAM instead of IRAM
*/ */
extern void *pvPortMalloc( size_t xWantedSize, const char * file, unsigned line, unsigned char use_iram); extern void *pvPortMalloc( size_t xWantedSize, const char * file, unsigned line, bool use_iram);
extern void *pvPortZalloc( size_t xWantedSize, const char * file, unsigned line); extern void *pvPortZalloc( size_t xWantedSize, const char * file, unsigned line);
extern void *pvPortCalloc(size_t count, size_t size, const char * file, unsigned line); extern void *pvPortCalloc(size_t count, size_t size, const char * file, unsigned line);
extern void vPortFree(void *pv, const char * file, unsigned line); extern void vPortFree(void *pv, const char * file, unsigned line);