better compatibility for IPAddress changes with external libraries (#…

…5438)
esp8266 · Dec 5, 2018 · f8f4b81 · f8f4b81
1 parent e44bcfe
commit f8f4b81
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/cores/esp8266/IPAddress.h b/cores/esp8266/IPAddress.h
@@ -41,7 +41,7 @@
 #else // lwIP-v2+
 #define CONST const
 #if !LWIP_IPV6
-#define ip_addr ipv4_addr
+struct ip_addr: ipv4_addr { };
 #endif // !LWIP_IPV6
 #endif // lwIP-v2+
 
@@ -208,6 +208,4 @@ class IPAddress: public Printable {
 extern CONST IPAddress INADDR_ANY;
 extern const IPAddress INADDR_NONE;
 
-#include <AddrList.h>  // bring interface iterator
-
 #endif
diff --git a/libraries/ESP8266WiFi/examples/EarlyDisableWiFi/EarlyDisableWiFi.ino b/libraries/ESP8266WiFi/examples/EarlyDisableWiFi/EarlyDisableWiFi.ino
@@ -1,5 +1,6 @@
 
 #include <ESP8266WiFi.h>
+#include <AddrList.h>
 
 #ifndef STASSID
 #define STASSID "your-ssid"

diff --git a/libraries/ESP8266WiFi/examples/IPv6/IPv6.ino b/libraries/ESP8266WiFi/examples/IPv6/IPv6.ino
@@ -19,6 +19,7 @@
 #include <ESP8266WiFi.h>
 #include <WiFiUdp.h>
 #include <PolledTimeout.h>
+#include <AddrList.h>
 #include <lwip/dns.h>
 
 #ifndef STASSID