8000 remove lwip-v1.4 specific code by d-a-v · Pull Request #7436 · esp8266/Arduino · GitHub
[go: up one dir, main page]
Skip to content

remove lwip-v1.4 specific code #7436

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
merged 17 commits into from
Jul 9, 2020
Merged

remove lwip-v1.4 specific code #7436

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
16cb8b8
remove lwip-v1.4 specific code
d-a-v Jul 7, 2020
9216a12
ditto
d-a-v Jul 7, 2020
fa2dfaf
ditto
d-a-v Jul 7, 2020
fd23198
fix ip4_addr definition
d-a-v Jul 8, 2020
866c8e7
CI: change debug builds to use IPv6, remove regular IPv6 builds
d-a-v Jul 8, 2020
169a3df
ditto
d-a-v Jul 8, 2020
76e87fd
split pio CI in four (because they last twice the time of the other b…
d-a-v Jul 8, 2020
5bc2259
remove option from pio
d-a-v Jul 8, 2020
54cb87c
Merge branch 'master' into nolwip14
d-a-v Jul 8, 2020
2661885
remove lwIP-1.4 from doc
d-a-v Jul 8, 2020
4adcceb
restore pio CI splitting
d-a-v Jul 8, 2020
5ca2aba
fix CI debug6 script
d-a-v Jul 8, 2020
0d0fc29
ditto
d-a-v Jul 8, 2020
3d37403
Merge branch 'nolwip14' of github.com:d-a-v/Arduino into nolwip14
d-a-v Jul 8, 2020
f45b3ab
Merge branch 'master' into nolwip14
earlephilhower Jul 8, 2020
c84f522
Merge branch 'master' into nolwip14
d-a-v Jul 9, 2020
c4dfb13
Merge branch 'master' into nolwip14
earlephilhower Jul 9, 2020
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
Prev Previous commit
Next Next commit
fix ip4_addr definition
  • Loading branch information
@d-a-v
d-a-v committed Jul 8, 2020
commit fd231984ea367aac0bcbad3d46a1bd5347c0ed9a
1 change: 1 addition & 0 deletions cores/esp8266/IPAddress.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

#include <lwip/init.h>
#include <lwip/ip_addr.h>
#include <lwip/ip4_addr.h>

#if !LWIP_IPV6
struct ip_addr: ipv4_addr { };
Expand Down
3 changes: 2 additions & 1 deletion tools/sdk/include/ipv4_addr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,9 @@
// hence ipv4_addr/t is IPv4 version/copy of IPv4 ip_addr/_t
// when IPv6 is enabled so we can deal with IPv4 use from firmware API.

// official lwIP's definitions (1.4 or 2)
// official lwIP's definitions
#include "lwip/ip_addr.h"
#include <lwip/ip4_addr.h>

#define ipv4_addr ip4_addr
#define ipv4_addr_t ip4_addr_t
Expand Down
0