summaryrefslogtreecommitdiffstats
path: root/unix/tclUnixSock.c
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2017-09-01 01:44:09 (GMT)
committerdgp <dgp@users.sourceforge.net>2017-09-01 01:44:09 (GMT)
commit25bef43b39f0af4f1729dd82573fc4bd9b44fd7f (patch)
tree997417738cae50b8be6b50850513d5f7a78160c8 /unix/tclUnixSock.c
parent38b319739dd65940f0c634509f00ad6dc5cb98de (diff)
parent1997e71e603d7d479143da6fdf0db628f8f9ba82 (diff)
downloadtcl-25bef43b39f0af4f1729dd82573fc4bd9b44fd7f.zip
tcl-25bef43b39f0af4f1729dd82573fc4bd9b44fd7f.tar.gz
tcl-25bef43b39f0af4f1729dd82573fc4bd9b44fd7f.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 c0df035..45abc01 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.c
@@ -646,7 +646,7 @@ TcpCloseProc(
while (fds != NULL) {
TcpFdList *next = fds->next;
- ckfree(fds);
+ ckfree(fds);
fds = next;
}
if (statePtr->addrlist != NULL) {
@@ -730,8 +730,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)
@@ -752,7 +754,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