diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-05 07:53:08 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-05 07:53:08 (GMT) |
| commit | ce0c892ca83196190690241027b28e43514254d3 (patch) | |
| tree | ddd4ce90f69e0335f425b1729bc27bbd20e26fde | |
| parent | 71c7f53daa1f6b2d9e238f2a269b4c4af8a7aa9d (diff) | |
| parent | 91500fc2feafa36fe71ce1453075b73386d16e34 (diff) | |
| download | tk-ce0c892ca83196190690241027b28e43514254d3.zip tk-ce0c892ca83196190690241027b28e43514254d3.tar.gz tk-ce0c892ca83196190690241027b28e43514254d3.tar.bz2 | |
Merge 8.6. Sync tcl.m4 from Tcl 8.7
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | macosx/Tk-Common.xcconfig | 2 | ||||
| -rwxr-xr-x | unix/configure | 2 | ||||
| -rw-r--r-- | unix/tcl.m4 | 2 | ||||
| -rwxr-xr-x | win/configure | 2 | ||||
| -rw-r--r-- | win/tcl.m4 | 2 |
6 files changed, 6 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 6711414..ca444b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,6 +35,7 @@ jobs: - make install - make test-classic >out-classic.txt - cat out-classic.txt + - grep -q "Failed 0" out-classic.txt - make test-ttk >out-ttk.txt - cat out-ttk.txt - grep -q "Failed 0" out-ttk.txt diff --git a/macosx/Tk-Common.xcconfig b/macosx/Tk-Common.xcconfig index 6219135..0ece048 100644 --- a/macosx/Tk-Common.xcconfig +++ b/macosx/Tk-Common.xcconfig @@ -23,7 +23,7 @@ GCC_NO_COMMON_BLOCKS = YES GCC_DYNAMIC_NO_PIC = YES GCC_VERSION = 4.2 GCC = gcc-$(GCC_VERSION) -WARNING_CFLAGS = -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-value -Winit-self -Wpointer-arith -Wcast-align -Wdisabled-optimization -Winline $(WARNING_CFLAGS) +WARNING_CFLAGS = -Wall -Wextra -Wshadow -Wwrite-strings -Wpointer-arith -Winit-self -Wcast-align -Wdisabled-optimization -Winline $(WARNING_CFLAGS) REZ_RESOURCE_MAP_READ_ONLY = YES APPLICATION_INSTALL_PATH = /Applications/Utilities BINDIR = $(PREFIX)/bin diff --git a/unix/configure b/unix/configure index 13c36a9..6edbceb 100755 --- a/unix/configure +++ b/unix/configure @@ -4239,7 +4239,7 @@ fi if test "$GCC" = yes; then : CFLAGS_OPTIMIZE=-O2 - CFLAGS_WARNING="-Wall -Wextra -Wwrite-strings -Wpointer-arith" + CFLAGS_WARNING="-Wall -Wextra -Wshadow -Wwrite-strings -Wpointer-arith" case "${CC}" in *++|*++-*) ;; diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 056cf1f..ea3d968 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -966,7 +966,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ CFLAGS_DEBUG=-g AS_IF([test "$GCC" = yes], [ CFLAGS_OPTIMIZE=-O2 - CFLAGS_WARNING="-Wall -Wextra -Wwrite-strings -Wpointer-arith" + CFLAGS_WARNING="-Wall -Wextra -Wshadow -Wwrite-strings -Wpointer-arith" case "${CC}" in *++|*++-*) ;; diff --git a/win/configure b/win/configure index 686fc48..c5e4825 100755 --- a/win/configure +++ b/win/configure @@ -4256,7 +4256,7 @@ $as_echo "using shared flags" >&6; } CFLAGS_DEBUG=-g CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer" - CFLAGS_WARNING="-Wall -Wextra -Wwrite-strings -Wpointer-arith" + CFLAGS_WARNING="-Wall -Wextra -Wshadow -Wwrite-strings -Wpointer-arith" LDFLAGS_DEBUG= LDFLAGS_OPTIMIZE= @@ -673,7 +673,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ CFLAGS_DEBUG=-g CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer" - CFLAGS_WARNING="-Wall -Wextra -Wwrite-strings -Wpointer-arith" + CFLAGS_WARNING="-Wall -Wextra -Wshadow -Wwrite-strings -Wpointer-arith" LDFLAGS_DEBUG= LDFLAGS_OPTIMIZE= |