summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-08-17 06:08:18 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-08-17 06:08:18 (GMT)
commit4f9bff583b0e119243a0ebf254e1a3bb6f55714d (patch)
tree7ec6dea0f79b85a5b45aa285b979110c26006c6b /win
parent08ea9c49500bc7adc443804d2c8ae91fa7b500b4 (diff)
downloadtk-4f9bff583b0e119243a0ebf254e1a3bb6f55714d.zip
tk-4f9bff583b0e119243a0ebf254e1a3bb6f55714d.tar.gz
tk-4f9bff583b0e119243a0ebf254e1a3bb6f55714d.tar.bz2
Disable warnings C4146 and C4305 (last one for 32-bit only) on Microsoft compilers. Tcl already does this, but this was never taken over by Tk
Diffstat (limited to 'win')
-rw-r--r--win/tkWinPort.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/win/tkWinPort.h b/win/tkWinPort.h
index 9829af5..1ef90ff 100644
--- a/win/tkWinPort.h
+++ b/win/tkWinPort.h
@@ -91,11 +91,15 @@
* See ticket [916c1095438eae56]: GetVersionExW triggers warnings
*/
#if defined(_MSC_VER)
+# pragma warning(disable:4146)
# pragma warning(disable:4267)
# pragma warning(disable:4244)
# pragma warning(disable:4311)
# pragma warning(disable:4312)
# pragma warning(disable:4996)
+#if !defined(_WIN64)
+# pragma warning(disable:4305)
+#endif
#endif
/*