summaryrefslogtreecommitdiffstats
path: root/unix/tclUnixSock.c
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2017-06-16 20:28:53 (GMT)
committerdgp <dgp@users.sourceforge.net>2017-06-16 20:28:53 (GMT)
commitcca5a0c27a301473dd9e717180bb6db0cabd8f78 (patch)
treed761f4a3fb5546b8115125f8dc40389056c00bbf /unix/tclUnixSock.c
parent9a51ddaa6e245b55bd471afb1797e1a11eecb960 (diff)
parent73f548527aa3d3852c86c86fba701c277e43e40f (diff)
downloadtcl-cca5a0c27a301473dd9e717180bb6db0cabd8f78.zip
tcl-cca5a0c27a301473dd9e717180bb6db0cabd8f78.tar.gz
tcl-cca5a0c27a301473dd9e717180bb6db0cabd8f78.tar.bz2
merge trunk
Diffstat (limited to 'unix/tclUnixSock.c')
-rw-r--r--unix/tclUnixSock.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
index b21deae..c16a482 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.c
@@ -733,6 +733,8 @@ TcpClose2Proc(
*/
#ifndef NEED_FAKE_RFC2553
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstrict-aliasing"
static inline int
IPv6AddressNeedsNumericRendering(
struct in6_addr addr)
@@ -746,16 +748,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