diff options
author | dgp <dgp@users.sourceforge.net> | 2021-01-08 21:07:57 (GMT) |
---|---|---|
committer | dgp <dgp@users.sourceforge.net> | 2021-01-08 21:07:57 (GMT) |
commit | 8229cd730444707ecef238b9678a5c8d779554f0 (patch) | |
tree | 28dbb787f28e59d75da785125db09451de89b1ff /win/configure | |
parent | db51032d33e94c96859a874ec838558620720a09 (diff) | |
parent | 4e3cd053dbb7487dfdf2e93f5151d9bdd5f9865e (diff) | |
download | tcl-8229cd730444707ecef238b9678a5c8d779554f0.zip tcl-8229cd730444707ecef238b9678a5c8d779554f0.tar.gz tcl-8229cd730444707ecef238b9678a5c8d779554f0.tar.bz2 |
Merge 8.7 (resolve conflicts)
Diffstat (limited to 'win/configure')
-rwxr-xr-x | win/configure | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/win/configure b/win/configure index 49c195b..dc7155b 100755 --- a/win/configure +++ b/win/configure @@ -4338,7 +4338,7 @@ printf "%s\n" "using shared flags" >&6; } CFLAGS_WARNING="${CFLAGS_WARNING} -Wno-format" ;; *) - CFLAGS_WARNING="${CFLAGS_WARNING} -Wc++-compat -fextended-identifiers -Wdeclaration-after-statement" + CFLAGS_WARNING="${CFLAGS_WARNING} -Wc++-compat -fextended-identifiers" ;; esac @@ -4399,9 +4399,9 @@ else $as_nop fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext if test "$tcl_win_64bit" = "yes" ; then - do64bit=amd64 - MACHINE="AMD64" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using 64-bit $MACHINE mode" >&5 + do64bit=amd64 + MACHINE="AMD64" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using 64-bit $MACHINE mode" >&5 printf "%s\n" " Using 64-bit $MACHINE mode" >&6; } fi ;; |