summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2017-06-14 21:42:38 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2017-06-14 21:42:38 (GMT)
commit865f11be2c3ee4294408debefcd72de0fc6b2772 (patch)
treed24a5a2b7a92cd7208413ed2811a7d450c4f6b8b
parent9858231309132643a953411c3305a979d329a248 (diff)
downloadtcl-865f11be2c3ee4294408debefcd72de0fc6b2772.zip
tcl-865f11be2c3ee4294408debefcd72de0fc6b2772.tar.gz
tcl-865f11be2c3ee4294408debefcd72de0fc6b2772.tar.bz2
[f2336c116b] Move pragmas to make gcc happy; it is pickier than clang.
-rw-r--r--unix/tclUnixSock.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
index 2353f94..c0df035 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.c
@@ -730,6 +730,8 @@ TcpClose2Proc(
*/
#ifndef NEED_FAKE_RFC2553
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstrict-aliasing"
static inline int
IPv6AddressNeedsNumericRendering(
struct in6_addr addr)
@@ -743,16 +745,14 @@ IPv6AddressNeedsNumericRendering(
* at least some versions of OSX.
*/
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
if (!IN6_IS_ADDR_V4MAPPED(&addr)) {
-#pragma GCC diagnostic pop
return 0;
}
return (addr.s6_addr[12] == 0 && addr.s6_addr[13] == 0
&& addr.s6_addr[14] == 0 && addr.s6_addr[15] == 0);
}
+#pragma GCC diagnostic pop
#endif /* NEED_FAKE_RFC2553 */
static void