diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-21 08:54:58 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-21 08:54:58 (GMT) |
| commit | 2119ee5eb73d55cc417be2146168a9892187e409 (patch) | |
| tree | 12ecf3e6db2e2b6a050892b1bd5d8397b1d92162 | |
| parent | b502cdbf572fbb9aaa188167489f6b0ab38a7ed5 (diff) | |
| parent | 8514e602485031cf491be2482dc2aedf558e7c07 (diff) | |
| download | tcl-2119ee5eb73d55cc417be2146168a9892187e409.zip tcl-2119ee5eb73d55cc417be2146168a9892187e409.tar.gz tcl-2119ee5eb73d55cc417be2146168a9892187e409.tar.bz2 | |
Merge 8.7
| -rw-r--r-- | generic/tcl.h | 2 | ||||
| -rw-r--r-- | win/tclWinPort.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/generic/tcl.h b/generic/tcl.h index 44f8246..eb6d2fe 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -265,7 +265,7 @@ typedef void *ClientData; */ #if !defined(TCL_WIDE_INT_TYPE)&&!defined(TCL_WIDE_INT_IS_LONG) -# if defined(_MSC_VER) || defined(_WIN32) +# if defined(_WIN32) && (!defined(__USE_MINGW_ANSI_STDIO) || !__USE_MINGW_ANSI_STDIO) # define TCL_WIDE_INT_TYPE __int64 # define TCL_LL_MODIFIER "I64" # if defined(_WIN64) diff --git a/win/tclWinPort.h b/win/tclWinPort.h index 78559f5..eb04245 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 |