summaryrefslogtreecommitdiffstats
path: root/unix/tclUnixSock.c
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2017-09-01 00:52:27 (GMT)
committerdgp <dgp@users.sourceforge.net>2017-09-01 00:52:27 (GMT)
commitd6ea58f1103b8e3ef6c70d7576d4222be75c72fc (patch)
treed0f7882d38a74051b17dc46c866732bda40901d9 /unix/tclUnixSock.c
parentc53cfa6c6a701b037b6a49949ec657e8ddcd3f94 (diff)
parent105a61c09b0ac586054fe67876d8456edfcd228b (diff)
downloadtcl-d6ea58f1103b8e3ef6c70d7576d4222be75c72fc.zip
tcl-d6ea58f1103b8e3ef6c70d7576d4222be75c72fc.tar.gz
tcl-d6ea58f1103b8e3ef6c70d7576d4222be75c72fc.tar.bz2
merge trunk
Diffstat (limited to 'unix/tclUnixSock.c')
-rw-r--r--unix/tclUnixSock.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
index c16a482..f595eac 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.c
@@ -649,7 +649,7 @@ TcpCloseProc(
while (fds != NULL) {
TcpFdList *next = fds->next;
- ckfree(fds);
+ ckfree(fds);
fds = next;
}
if (statePtr->addrlist != NULL) {
@@ -733,8 +733,10 @@ TcpClose2Proc(
*/
#ifndef NEED_FAKE_RFC2553
+#if defined (__clang__) || ((__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5))))
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wstrict-aliasing"
+#endif
static inline int
IPv6AddressNeedsNumericRendering(
struct in6_addr addr)
@@ -755,7 +757,9 @@ IPv6AddressNeedsNumericRendering(
return (addr.s6_addr[12] == 0 && addr.s6_addr[13] == 0
&& addr.s6_addr[14] == 0 && addr.s6_addr[15] == 0);
}
+#if defined (__clang__) || ((__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5))))
#pragma GCC diagnostic pop
+#endif
#endif /* NEED_FAKE_RFC2553 */
static void