mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-03-21 14:18:38 -05:00
clang-specific pragmas to suppress -Wmissing-braces.
When I added some extra braces in commit 095072fa4 to suppress this warning, I think in fact I did the wrong thing, because the declaration syntax I was originally using is the Microsoft-recommended one in spite of clang not liking it - I think MS would be within their rights (should they feel like it) to add those missing braces in a later version of the WinSock headers, which would make the current warning-clean code stop compiling. So it's better to put the code back as it was, and avoid the clang warning by using clang's warning-suppression pragmas for just those declarations. I've also done the same thing in winnet.c, for two initialisers of IPv6 well-known addresses which had the same problem (but which I didn't notice yesterday because a misjudged set of Windows version macros had prevented me from compiling that file successfully at all).
This commit is contained in:
parent
2e229cb179
commit
730a9fdfe3
@ -17,8 +17,15 @@
|
|||||||
#include <ws2tcpip.h>
|
#include <ws2tcpip.h>
|
||||||
|
|
||||||
#ifndef NO_IPV6
|
#ifndef NO_IPV6
|
||||||
|
#ifdef __clang__
|
||||||
|
#pragma clang diagnostic push
|
||||||
|
#pragma clang diagnostic ignored "-Wmissing-braces"
|
||||||
|
#endif
|
||||||
const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT;
|
const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT;
|
||||||
const struct in6_addr in6addr_loopback = IN6ADDR_LOOPBACK_INIT;
|
const struct in6_addr in6addr_loopback = IN6ADDR_LOOPBACK_INIT;
|
||||||
|
#ifdef __clang__
|
||||||
|
#pragma clang diagnostic pop
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define ipv4_is_loopback(addr) \
|
#define ipv4_is_loopback(addr) \
|
||||||
|
@ -94,8 +94,16 @@ PSID get_user_sid(void)
|
|||||||
|
|
||||||
int getsids(char **error)
|
int getsids(char **error)
|
||||||
{
|
{
|
||||||
SID_IDENTIFIER_AUTHORITY world_auth = { SECURITY_WORLD_SID_AUTHORITY };
|
#ifdef __clang__
|
||||||
SID_IDENTIFIER_AUTHORITY nt_auth = { SECURITY_NT_AUTHORITY };
|
#pragma clang diagnostic push
|
||||||
|
#pragma clang diagnostic ignored "-Wmissing-braces"
|
||||||
|
#endif
|
||||||
|
SID_IDENTIFIER_AUTHORITY world_auth = SECURITY_WORLD_SID_AUTHORITY;
|
||||||
|
SID_IDENTIFIER_AUTHORITY nt_auth = SECURITY_NT_AUTHORITY;
|
||||||
|
#ifdef __clang__
|
||||||
|
#pragma clang diagnostic pop
|
||||||
|
#endif
|
||||||
|
|
||||||
int ret = FALSE;
|
int ret = FALSE;
|
||||||
|
|
||||||
*error = NULL;
|
*error = NULL;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user