From af007b9c7ebdff1b232eb2c92142652a2c396470 Mon Sep 17 00:00:00 2001
From: David Gauchard <gauchard@laas.fr>
Date: Thu, 29 Nov 2018 15:34:43 +0100
Subject: [PATCH] fix espconn and err_t

---
 tools/sdk/include/espconn.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tools/sdk/include/espconn.h b/tools/sdk/include/espconn.h
index 31bbf6a9b1..92df2fe38d 100644
--- a/tools/sdk/include/espconn.h
+++ b/tools/sdk/include/espconn.h
@@ -29,7 +29,12 @@
 extern "C" {
 #endif
 
-typedef sint8 err_t;
+//typedef sint8 err_t;
+// err_t has been redefined by espressif,
+// use autogenerated <lwip-err-t.h> to define LWIP_ERR_T,
+// this is compatible with both versions of lwIP.
+#include <../../lwip2/include/lwip-err-t.h>
+#include <lwip/err.h>
 
 typedef void *espconn_handle;
 typedef void (* espconn_connect_callback)(void *arg);