Merge branch 'contrib/github_pr_14411' into 'master'

fix(esp_netif): Fixed initializer order of ESP_IP macros for C++ (GitHub PR)

Closes IDFGH-13520

See merge request espressif/esp-idf!33175
This commit is contained in:
Abhik Roy 2024-09-12 18:44:40 +08:00
commit 1889851d7c

View File

@ -79,8 +79,8 @@ extern "C" {
#define ESP_IP4TOADDR(a,b,c,d) esp_netif_htonl(ESP_IP4TOUINT32(a, b, c, d))
#define ESP_IP4ADDR_INIT(a, b, c, d) { .type = ESP_IPADDR_TYPE_V4, .u_addr = { .ip4 = { .addr = ESP_IP4TOADDR(a, b, c, d) }}}
#define ESP_IP6ADDR_INIT(a, b, c, d) { .type = ESP_IPADDR_TYPE_V6, .u_addr = { .ip6 = { .addr = { a, b, c, d }, .zone = 0 }}}
#define ESP_IP4ADDR_INIT(a, b, c, d) { .u_addr = { .ip4 = { .addr = ESP_IP4TOADDR(a, b, c, d) }}, .type = ESP_IPADDR_TYPE_V4 }
#define ESP_IP6ADDR_INIT(a, b, c, d) { .u_addr = { .ip6 = { .addr = { a, b, c, d }, .zone = 0 }}, .type = ESP_IPADDR_TYPE_V6 }
#ifndef IP4ADDR_STRLEN_MAX
#define IP4ADDR_STRLEN_MAX 16