Merge pull request #1020 from Barenboim/master

Fixed C++ out-of-order designated initialization on MacOS with gcc
This commit is contained in:
xiehan
2022-08-18 17:05:09 +08:00
committed by GitHub
2 changed files with 2 additions and 12 deletions
+1 -6
View File
@@ -52,12 +52,7 @@ struct addrinfo ComplexDnsTask::hints =
{
.ai_flags = AI_NUMERICSERV | AI_NUMERICHOST,
.ai_family = AF_UNSPEC,
.ai_socktype = SOCK_STREAM,
.ai_protocol = 0,
.ai_addrlen = 0,
.ai_addr = NULL,
.ai_canonname = NULL,
.ai_next = NULL
.ai_socktype = SOCK_STREAM
};
CommMessageOut *ComplexDnsTask::message_out()
+1 -6
View File
@@ -56,12 +56,7 @@ static constexpr struct addrinfo __ai_hints =
.ai_flags = 0,
#endif
.ai_family = AF_UNSPEC,
.ai_socktype = SOCK_STREAM,
.ai_protocol = 0,
.ai_addrlen = 0,
.ai_addr = NULL,
.ai_canonname = NULL,
.ai_next = NULL
.ai_socktype = SOCK_STREAM
};
struct DnsContext