Merge 8.7

6 files changed, 7 insertions, 17 deletions

diff --git a/win/Makefile.in b/win/Makefile.in
index f1b72e1..9757c2e 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -596,7 +596,6 @@ ${TEST_DLL_FILE}: ${TCL_STUB_LIB_FILE} ${TCLTEST_OBJS}
 
 ${TEST_EXE_FILE}: ${TCL_STUB_LIB_FILE} ${TCLTEST_OBJS} tclTestMain.${OBJEXT}
 	@$(RM) ${TEST_EXE_FILE}
-	@$(RM) $(ROOT_DIR_NATIVE)/tests/safe-stock86.test
 	$(CC) $(CFLAGS) $(TCLTEST_OBJS) tclTestMain.$(OBJEXT) $(TCL_LIB_FILE) $(TCL_STUB_LIB_FILE) $(LIBS) \
         tclsh.$(RES) $(CC_EXENAME) $(LDFLAGS_CONSOLE)
 	$(COPY) tclsh.exe.manifest ${TEST_EXE_FILE}.manifest
diff --git a/win/configure b/win/configure
index d824244..5888332 100755
--- a/win/configure
+++ b/win/configure
@@ -3749,8 +3749,7 @@ fi
 _ACEOF
 
     else
-	# Default encoding on windows is not "iso8859-1"
-	$as_echo "#define TCL_CFGVAL_ENCODING \"cp1252\"" >>confdefs.h
+	$as_echo "#define TCL_CFGVAL_ENCODING \"utf-8\"" >>confdefs.h
 
     fi
 
diff --git a/win/makefile.vc b/win/makefile.vc
index e3de98e..a28d6bf 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -114,10 +114,6 @@
 #	TESTPAT=<file>

 #		Reads the tests requested to be run from this file.

 #

-#	CFG_ENCODING=encoding

-#		name of encoding for configuration information. Defaults

-#		to cp1252

-#

 # Examples:

 #       c:\tcl_src\win\>nmake -f makefile.vc release

 #       c:\tcl_src\win\>nmake -f makefile.vc test

diff --git a/win/rules.vc b/win/rules.vc
index 61df910..f3e5439 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -415,9 +415,6 @@ _INSTALLDIR=$(_INSTALLDIR)\lib
 # NATIVE_ARCH - set to IX86 or AMD64 for the host machine

 # MACHINE - same as $(ARCH) - legacy

 # _VC_MANIFEST_EMBED_{DLL,EXE} - commands for embedding a manifest if needed

-# CFG_ENCODING - set to an character encoding.

-#   TBD - this is passed to compiler as TCL_CFGVAL_ENCODING but can't

-#   see where it is used

 

 cc32		= $(CC)   # built-in default.

 link32		= link

@@ -503,10 +500,6 @@ _VC_MANIFEST_EMBED_EXE=if exist $@.manifest mt -nologo -manifest $@.manifest -ou
 _VC_MANIFEST_EMBED_DLL=if exist $@.manifest mt -nologo -manifest $@.manifest -outputresource:$@;2

 !endif

 

-!ifndef CFG_ENCODING

-CFG_ENCODING	= \"cp1252\"

-!endif

-

 ################################################################

 # 4. Build the nmakehlp program

 # This is a helper app we need to overcome nmake's limiting

@@ -1292,7 +1285,7 @@ INCLUDE_INSTALL_DIR	= $(_INSTALLDIR)\..\include
 # baselibs - minimum Windows libraries required. Parent makefile can

 #    define PRJ_LIBS before including rules.rc if additional libs are needed

 

-OPTDEFINES	= /DTCL_CFGVAL_ENCODING=$(CFG_ENCODING) /DSTDC_HEADERS

+OPTDEFINES	= /DSTDC_HEADERS

 !if $(VCVERSION) >= 1600

 OPTDEFINES	= $(OPTDEFINES) /DHAVE_STDINT_H=1

 !else

diff --git a/win/tcl.m4 b/win/tcl.m4
index a8aab6b..ea23a21 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -1085,8 +1085,7 @@ AC_DEFUN([SC_TCL_CFG_ENCODING], [
     if test x"${with_tcencoding}" != x ; then
 	AC_DEFINE_UNQUOTED(TCL_CFGVAL_ENCODING,"${with_tcencoding}")
     else
-	# Default encoding on windows is not "iso8859-1"
-	AC_DEFINE(TCL_CFGVAL_ENCODING,"cp1252")
+	AC_DEFINE(TCL_CFGVAL_ENCODING,"utf-8")
     fi
 ])
 
diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index 94c8e87..d0b689f 100644
--- a/win/tclWinPort.h
+++ b/win/tclWinPort.h
@@ -18,6 +18,10 @@
 /* See [Bug 3354324]: file mtime sets wrong time */
 #   define __MINGW_USE_VC2005_COMPAT
 #endif
+#if !defined(__USE_MINGW_ANSI_STDIO)
+/* See [Bug c975939973]: Usage of gnu_printf in latest mingw-w64 */
+#   define __USE_MINGW_ANSI_STDIO 0
+#endif
 #if defined(_MSC_VER) && defined(_WIN64) && !defined(STATIC_BUILD) \
 	&& !defined(MP_32BIT) && !defined(MP_64BIT)
 #   define MP_64BIT