diff options
| author | dgp <dgp@users.sourceforge.net> | 2017-09-01 01:44:09 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2017-09-01 01:44:09 (GMT) |
| commit | 25bef43b39f0af4f1729dd82573fc4bd9b44fd7f (patch) | |
| tree | 997417738cae50b8be6b50850513d5f7a78160c8 /unix | |
| parent | 38b319739dd65940f0c634509f00ad6dc5cb98de (diff) | |
| parent | 1997e71e603d7d479143da6fdf0db628f8f9ba82 (diff) | |
| download | tcl-25bef43b39f0af4f1729dd82573fc4bd9b44fd7f.zip tcl-25bef43b39f0af4f1729dd82573fc4bd9b44fd7f.tar.gz tcl-25bef43b39f0af4f1729dd82573fc4bd9b44fd7f.tar.bz2 | |
merge trunk
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 4 | ||||
| -rw-r--r-- | unix/tclLoadDyld.c | 2 | ||||
| -rw-r--r-- | unix/tclUnixPort.h | 8 | ||||
| -rw-r--r-- | unix/tclUnixSock.c | 6 |
4 files changed, 13 insertions, 7 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 12d4a6d..dbeb0a2 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -843,8 +843,8 @@ install-libraries: libraries do \ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \ done; - @echo "Installing package http 2.8.11 as a Tcl Module"; - @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.11.tm; + @echo "Installing package http 2.8.12 as a Tcl Module"; + @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.12.tm; @echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/"; @for i in $(TOP_DIR)/library/opt/*.tcl ; \ do \ 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/tclUnixPort.h b/unix/tclUnixPort.h index 2728957..ba56089 100644 --- a/unix/tclUnixPort.h +++ b/unix/tclUnixPort.h @@ -125,11 +125,11 @@ typedef off_t Tcl_SeekOffset; # include <sys/select.h> #endif #include <sys/stat.h> -#if TIME_WITH_SYS_TIME +#ifdef TIME_WITH_SYS_TIME # include <sys/time.h> # include <time.h> #else -#if HAVE_SYS_TIME_H +#ifdef HAVE_SYS_TIME_H # include <sys/time.h> #else # include <time.h> @@ -138,11 +138,11 @@ typedef off_t Tcl_SeekOffset; #ifndef NO_SYS_WAIT_H # include <sys/wait.h> #endif -#if HAVE_INTTYPES_H +#ifdef HAVE_INTTYPES_H # include <inttypes.h> #endif #include <limits.h> -#if HAVE_STDINT_H +#ifdef HAVE_STDINT_H # include <stdint.h> #endif #ifdef HAVE_UNISTD_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 |