diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-08-22 12:41:18 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-08-22 12:41:18 (GMT) |
| commit | 092ff2b2cdc4b956187625e58d2469dd94fdfdd4 (patch) | |
| tree | 103f81bcb4532f77e27af8e89e93184b49c90442 | |
| parent | 2b886b868c8231e01906b7435b9b71f301f91e90 (diff) | |
| parent | 3728831c291bc29f51ee826731bd206f28687d0d (diff) | |
| download | tcl-092ff2b2cdc4b956187625e58d2469dd94fdfdd4.zip tcl-092ff2b2cdc4b956187625e58d2469dd94fdfdd4.tar.gz tcl-092ff2b2cdc4b956187625e58d2469dd94fdfdd4.tar.bz2 | |
merge core-8-6-branch
| -rw-r--r-- | unix/tclLoadDyld.c | 2 | ||||
| -rw-r--r-- | unix/tclUnixSock.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/unix/tclLoadDyld.c b/unix/tclLoadDyld.c index 8b7dc58..e998bf9 100644 --- a/unix/tclLoadDyld.c +++ b/unix/tclLoadDyld.c @@ -48,7 +48,9 @@ #endif /* TCL_DYLD_USE_DLFCN */ #if TCL_DYLD_USE_NSMODULE || defined(TCL_LOAD_FROM_MEMORY) +#if defined (__clang__) || ((__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5)))) #pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif #include <mach-o/dyld.h> #include <mach-o/fat.h> #include <mach-o/swap.h> 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 |