From 11d53820f2c056f5b61391792f7695f45297194a Mon Sep 17 00:00:00 2001 From: Grigory Kirillov Date: Sun, 21 May 2023 01:34:53 +0300 Subject: [PATCH] Remove semicolons from ESP_IP4ADDR_INIT and ESP_IP6ADDR_INIT macros There are structs like esp_netif_dns_info_t that have member for generic ip for which the presence of semicolons is problematic, because when trying to initialize an ip member with one of these macroses it results in a syntax error since semicolon is used within curly braces. --- components/esp_netif/include/esp_netif_ip_addr.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/esp_netif/include/esp_netif_ip_addr.h b/components/esp_netif/include/esp_netif_ip_addr.h index 354da5814b..b8608c9c75 100644 --- 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) { .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 }}} #ifndef IP4ADDR_STRLEN_MAX #define IP4ADDR_STRLEN_MAX 16