From 0fd1201633322b1f8ddcccd92f0fea53e3cfd525 Mon Sep 17 00:00:00 2001
From: Me No Dev <me-no-dev@vdnsbg.com>
Date: Mon, 21 Dec 2015 14:47:48 +0200
Subject: [PATCH] fix tcp status redefinition and bad mem definitions in lwip

---
 .../ESP8266WiFi/src/include/wl_definitions.h     | 16 ----------------
 libraries/ESP8266WiFi/src/lwip/mem.h             | 10 +++++-----
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/libraries/ESP8266WiFi/src/include/wl_definitions.h b/libraries/ESP8266WiFi/src/include/wl_definitions.h
index 45bee6764..0669661b3 100644
--- a/libraries/ESP8266WiFi/src/include/wl_definitions.h
+++ b/libraries/ESP8266WiFi/src/include/wl_definitions.h
@@ -68,20 +68,4 @@ enum wl_enc_type {  /* Values map to 802.11 encryption suites... */
         ENC_TYPE_AUTO = 8
 };
 
-#if !defined(LWIP_INTERNAL)
-enum wl_tcp_state {
-  CLOSED      = 0,
-  LISTEN      = 1,
-  SYN_SENT    = 2,
-  SYN_RCVD    = 3,
-  ESTABLISHED = 4,
-  FIN_WAIT_1  = 5,
-  FIN_WAIT_2  = 6,
-  CLOSE_WAIT  = 7,
-  CLOSING     = 8,
-  LAST_ACK    = 9,
-  TIME_WAIT   = 10
-};
-#endif
-
 #endif /* WL_DEFINITIONS_H_ */
diff --git a/libraries/ESP8266WiFi/src/lwip/mem.h b/libraries/ESP8266WiFi/src/lwip/mem.h
index 1d768856c..ed58aa47f 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, "", 0)
+#define mem_free(p) vPortFree(p)
 #endif
 #ifndef mem_malloc
-#define mem_malloc(s) pvPortMalloc(s, "", 0)
+#define mem_malloc(s) pvPortMalloc(s)
 #endif
 #ifndef mem_calloc
-#define mem_calloc(s) pvPortCalloc(s, "", 0)
+#define mem_calloc(s) pvPortCalloc(s)
 #endif
 #ifndef mem_realloc
-#define mem_realloc(p, s) pvPortRealloc(p, s, "", 0)
+#define mem_realloc(p, s) pvPortRealloc(p, s)
 #endif
 #ifndef mem_zalloc
-#define mem_zalloc(s) pvPortZalloc(s, "", 0)
+#define mem_zalloc(s) pvPortZalloc(s)
 #endif
 
 #ifndef os_malloc