Merge f371940992 into 59e1838270

fix(esp_netif): Fixed initializer order of ESP_IP macros for C++
2024-09-19 04:16:01 -04:00 · 2024-09-09 20:55:55 +02:00 · 2024-08-21 05:04:09 +02:00
1 changed files with 2 additions and 2 deletions
--- a/components/esp_netif/include/esp_netif_ip_addr.h
+++ b/components/esp_netif/include/esp_netif_ip_addr.h
@ -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
Author	SHA1	Message	Date
snake-4	baaa829d5c	Merge `f371940992` into `59e1838270`	2024-09-09 20:55:55 +02:00
snake-4	f371940992	fix(esp_netif): Fixed initializer order of ESP_IP macros for C++	2024-08-21 05:04:09 +02:00