diff options
| author | dgp <dgp@users.sourceforge.net> | 2020-10-21 20:42:31 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2020-10-21 20:42:31 (GMT) |
| commit | 7d3aa742493ae4110cdd511102fc0f2b1f49a104 (patch) | |
| tree | faa3559281f0fdff0f19e8fae0f59b30ed100466 /win | |
| parent | c6927aa24249d107b15793921446b05ff9a8850d (diff) | |
| parent | fb10e693b2a8b1d3c30b2de7c9899f0d7a7081a9 (diff) | |
| download | tcl-7d3aa742493ae4110cdd511102fc0f2b1f49a104.zip tcl-7d3aa742493ae4110cdd511102fc0f2b1f49a104.tar.gz tcl-7d3aa742493ae4110cdd511102fc0f2b1f49a104.tar.bz2 | |
merge 8.6
Diffstat (limited to 'win')
| -rw-r--r-- | win/tclWinInt.h | 4 | ||||
| -rw-r--r-- | win/tclWinPort.h | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/win/tclWinInt.h b/win/tclWinInt.h index 5f532bc..a44abd9 100644 --- a/win/tclWinInt.h +++ b/win/tclWinInt.h @@ -54,7 +54,11 @@ MODULE_SCOPE TclWinProcs tclWinProcs; #endif #ifdef _WIN64 +#if defined(__USE_MINGW_ANSI_STDIO) && __USE_MINGW_ANSI_STDIO +# define TCL_I_MODIFIER "ll" +#else # define TCL_I_MODIFIER "I" +#endif #else # define TCL_I_MODIFIER "" #endif diff --git a/win/tclWinPort.h b/win/tclWinPort.h index 8641e5e..6bfbf0c 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 /* * We must specify the lower version we intend to support. |