summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2021-01-08 13:10:15 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2021-01-08 13:10:15 (GMT)
commitaae3a669ada5541a537aa36d6c4616f304f3f655 (patch)
tree49d317650647fd5ba44298237a8beb027ee3727d /win
parent1754a52a4c38bb15ff6ceb6ac64514442ebbd989 (diff)
parent80cdb70e0fec0588023ca95e7300b5e8c95402a3 (diff)
downloadtk-aae3a669ada5541a537aa36d6c4616f304f3f655.zip
tk-aae3a669ada5541a537aa36d6c4616f304f3f655.tar.gz
tk-aae3a669ada5541a537aa36d6c4616f304f3f655.tar.bz2
Merge 8.6. Sync */tcl.m4 with Tcl
Diffstat (limited to 'win')
-rwxr-xr-xwin/configure8
-rw-r--r--win/tcl.m48
2 files changed, 8 insertions, 8 deletions
diff --git a/win/configure b/win/configure
index f253e6d..b952647 100755
--- a/win/configure
+++ b/win/configure
@@ -4457,7 +4457,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
@@ -4518,9 +4518,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
;;
diff --git a/win/tcl.m4 b/win/tcl.m4
index 49b6b99..ca26311 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -673,7 +673,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
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
@@ -717,9 +717,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
[tcl_win_64bit=no]
)
if test "$tcl_win_64bit" = "yes" ; then
- do64bit=amd64
- MACHINE="AMD64"
- AC_MSG_RESULT([ Using 64-bit $MACHINE mode])
+ do64bit=amd64
+ MACHINE="AMD64"
+ AC_MSG_RESULT([ Using 64-bit $MACHINE mode])
fi
;;
esac