diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-05-22 12:00:14 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-05-22 12:00:14 (GMT) |
| commit | ce52edbd0eabf28f3a49c2a99d10a9dbc06ab943 (patch) | |
| tree | d52ec9d68ac9682dcfc61b29e1eab343dbba1668 /win | |
| parent | af999a3a2c4770f8654059f5c5b50d766cc88c7f (diff) | |
| parent | 326c72a0d919b2c96c48a3df365dc8a7256dacd7 (diff) | |
| download | tcl-ce52edbd0eabf28f3a49c2a99d10a9dbc06ab943.zip tcl-ce52edbd0eabf28f3a49c2a99d10a9dbc06ab943.tar.gz tcl-ce52edbd0eabf28f3a49c2a99d10a9dbc06ab943.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'win')
| -rw-r--r-- | win/rules.vc | 4 | ||||
| -rw-r--r-- | win/tclWinPort.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/win/rules.vc b/win/rules.vc index 3107756..47c0742 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -1470,8 +1470,8 @@ cdebug = $(cdebug) -Zi !endif # $(DEBUG)
-# cwarn includes default warning levels, also C4146 is useless.
-cwarn = $(WARNINGS) -wd4146
+# cwarn includes default warning levels, also C4090 (buggy) and C4146 is useless.
+cwarn = $(WARNINGS) -wd4090 -wd4146
!if "$(MACHINE)" == "AMD64" || "$(MACHINE)" == "ARM64"
# Disable pointer<->int warnings related to cast between different sizes
diff --git a/win/tclWinPort.h b/win/tclWinPort.h index 455ceab..b61e481 100644 --- a/win/tclWinPort.h +++ b/win/tclWinPort.h @@ -458,6 +458,7 @@ typedef DWORD_PTR * PDWORD_PTR; #endif /* _MSC_VER || __MSVCRT__ */ #if defined(_MSC_VER) +# pragma warning(disable:4090) /* see: https://developercommunity.visualstudio.com/t/c-compiler-incorrect-propagation-of-const-qualifie/390711 */ # pragma warning(disable:4146) # pragma warning(disable:4244) # pragma warning(disable:4267) |