Skip to content

better compatibility for IPAddress changes with external libraries #5438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
devyte merged 3 commits into from
Dec 5, 2018
Merged

better compatibility for IPAddress changes with external libraries #5438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
62212e6
better compatibility for IPAddress changes with external libraries
d-a-v Dec 5, 2018
b75ddcb
Merge branch 'master' into compat
d-a-v Dec 5, 2018
3b9f91b
Merge branch 'master' into compat
devyte Dec 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions cores/esp8266/IPAddress.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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+

Expand Down Expand Up @@ -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
1 change: 1 addition & 0 deletions libraries/ESP8266WiFi/examples/EarlyDisableWiFi/EarlyDisableWiFi.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@

#include <ESP8266WiFi.h>
#include <AddrList.h>

#ifndef STASSID
#define STASSID "your-ssid"
Expand Down
1 change: 1 addition & 0 deletions libraries/ESP8266WiFi/examples/IPv6/IPv6.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include <ESP8266WiFi.h>
#include <WiFiUdp.h>
#include <PolledTimeout.h>
#include <AddrList.h>
#include <lwip/dns.h>

#ifndef STASSID
Expand Down