Merge remote-tracking branch 'esp8266/master'

# Conflicts:
#	libraries/ESP8266WiFi/src/include/wl_definitions.h

Author: Me No Dev

libraries/ESP8266WiFi/src/include/wl_definitions.h

@@ -68,8 +68,7 @@ enum wl_enc_type {  /* Values map to 802.11 encryption suites... */
         ENC_TYPE_AUTO = 8
 };
 
-#ifndef __LWIP_TCP_H__
-#ifndef LWIP_INTERNAL
+#if !defined(LWIP_INTERNAL) && !defined(__LWIP_TCP_H__)
 enum wl_tcp_state {
   CLOSED      = 0,
   LISTEN      = 1,