mirror of
https://github.com/esp8266/Arduino.git
synced 2025-06-12 01:53:07 +03:00
remove lwip-v1.4 specific code (#7436)
* remove lwip-v1.4 specific code * ditto * ditto * fix ip4_addr definition * CI: change debug builds to use IPv6, remove regular IPv6 builds * ditto * split pio CI in four (because they last twice the time of the other builds) * remove option from pio * remove lwIP-1.4 from doc * restore pio CI splitting * fix CI debug6 script * ditto
This commit is contained in:
@ -34,16 +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"
|
||||
|
||||
///////////////////////////////////////////////
|
||||
#if LWIP_VERSION_MAJOR == 1
|
||||
|
||||
#define ipv4_addr ip_addr
|
||||
|
||||
///////////////////////////////////////////////
|
||||
#else // lwIP-v2
|
||||
#include <lwip/ip4_addr.h>
|
||||
|
||||
#define ipv4_addr ip4_addr
|
||||
#define ipv4_addr_t ip4_addr_t
|
||||
@ -55,7 +48,4 @@ struct ip_info {
|
||||
struct ipv4_addr gw;
|
||||
};
|
||||
|
||||
///////////////////////////////////////////////
|
||||
#endif // lwIP-v2
|
||||
|
||||
#endif // __IPV4_ADDR_H__
|
||||
|
@ -5,11 +5,7 @@
|
||||
|
||||
#include "lwip/init.h"
|
||||
#include "lwip/ip_addr.h"
|
||||
#if LWIP_VERSION_MAJOR == 1
|
||||
#include "lwip/sntp.h"
|
||||
#else
|
||||
#include "lwip/apps/sntp.h"
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
Reference in New Issue
Block a user