Skip to content

Commit 1f12ddb

Browse files
authored
fix(network): fixes a macro name conflict warning
1 parent 4677ea6 commit 1f12ddb

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Diff for: libraries/Network/src/NetworkClient.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include <lwip/netdb.h>
2424
#include <errno.h>
2525

26-
#define IN6_IS_ADDR_V4MAPPED(a) ((((__const uint32_t *)(a))[0] == 0) && (((__const uint32_t *)(a))[1] == 0) && (((__const uint32_t *)(a))[2] == htonl(0xffff)))
26+
#define _IN6_IS_ADDR_V4MAPPED(a) ((((__const uint32_t *)(a))[0] == 0) && (((__const uint32_t *)(a))[1] == 0) && (((__const uint32_t *)(a))[2] == htonl(0xffff)))
2727

2828
#define WIFI_CLIENT_DEF_CONN_TIMEOUT_MS (3000)
2929
#define WIFI_CLIENT_MAX_WRITE_RETRY (10)
@@ -598,7 +598,7 @@ IPAddress NetworkClient::remoteIP(int fd) const {
598598
// IPv6, but it might be IPv4 mapped address
599599
if (((struct sockaddr *)&addr)->sa_family == AF_INET6) {
600600
struct sockaddr_in6 *saddr6 = (struct sockaddr_in6 *)&addr;
601-
if (IN6_IS_ADDR_V4MAPPED(saddr6->sin6_addr.un.u32_addr)) {
601+
if (_IN6_IS_ADDR_V4MAPPED(saddr6->sin6_addr.un.u32_addr)) {
602602
return IPAddress(IPv4, (uint8_t *)saddr6->sin6_addr.s6_addr + IPADDRESS_V4_BYTES_INDEX);
603603
} else {
604604
return IPAddress(IPv6, (uint8_t *)(saddr6->sin6_addr.s6_addr), saddr6->sin6_scope_id);
@@ -640,7 +640,7 @@ IPAddress NetworkClient::localIP(int fd) const {
640640
// IPv6, but it might be IPv4 mapped address
641641
if (((struct sockaddr *)&addr)->sa_family == AF_INET6) {
642642
struct sockaddr_in6 *saddr6 = (struct sockaddr_in6 *)&addr;
643-
if (IN6_IS_ADDR_V4MAPPED(saddr6->sin6_addr.un.u32_addr)) {
643+
if (_IN6_IS_ADDR_V4MAPPED(saddr6->sin6_addr.un.u32_addr)) {
644644
return IPAddress(IPv4, (uint8_t *)saddr6->sin6_addr.s6_addr + IPADDRESS_V4_BYTES_INDEX);
645645
} else {
646646
return IPAddress(IPv6, (uint8_t *)(saddr6->sin6_addr.s6_addr), saddr6->sin6_scope_id);

0 commit comments

Comments
 (0)