From e9308e6266f7d5879d95f56fa8490809c85d9d7d Mon Sep 17 00:00:00 2001
From: Wu Jian Gang <wujiangang@espressif.com>
Date: Fri, 4 May 2018 11:56:48 +0800
Subject: [PATCH] fix(lwip): Fix definition conflict

---
 components/lwip/include/lwip/port/lwipopts.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/lwip/include/lwip/port/lwipopts.h b/components/lwip/include/lwip/port/lwipopts.h
index 8a94994c..2eb44513 100644
--- a/components/lwip/include/lwip/port/lwipopts.h
+++ b/components/lwip/include/lwip/port/lwipopts.h
@@ -46,6 +46,7 @@
 
 #include "sdkconfig.h"
 #include <stddef.h>
+#include <stdbool.h>
 #include "esp_libc.h"
 
 //#define SOCKETS_MT
@@ -193,7 +194,7 @@
 /**
  * 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 *pvPortCalloc(size_t count, size_t size, const char * file, unsigned line);
 extern void vPortFree(void *pv, const char * file, unsigned line);