diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-09-10 13:35:18 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-09-10 13:35:18 (GMT) |
| commit | 0d0ab7f8292358e44732a13225e806fda74b13e0 (patch) | |
| tree | 339a21d14099ce6d530b561b7119f87f47b8d388 /unix/tclUnixSock.c | |
| parent | 4ac08a5375ba3f55cabdefe8744e465d8f9f5e84 (diff) | |
| parent | 75d248f10f149d5adad3cd716bc06dc67ef2dfea (diff) | |
| download | tcl-0d0ab7f8292358e44732a13225e806fda74b13e0.zip tcl-0d0ab7f8292358e44732a13225e806fda74b13e0.tar.gz tcl-0d0ab7f8292358e44732a13225e806fda74b13e0.tar.bz2 | |
merge novem
Diffstat (limited to 'unix/tclUnixSock.c')
| -rw-r--r-- | unix/tclUnixSock.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c index 2353f94..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,6 +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) @@ -743,16 +747,16 @@ 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); } +#if defined (__clang__) || ((__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5)))) +#pragma GCC diagnostic pop +#endif #endif /* NEED_FAKE_RFC2553 */ static void |