diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-08-17 06:09:49 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-08-17 06:09:49 (GMT) |
| commit | 3429267f021764f4911937b03becd9acf6109cf4 (patch) | |
| tree | b9f04ccb70b4ba81e8f9ce709e7ef249f136e15c /win | |
| parent | 8787794514ed32040c9a73c64c8258a42170b190 (diff) | |
| parent | 4f9bff583b0e119243a0ebf254e1a3bb6f55714d (diff) | |
| download | tk-3429267f021764f4911937b03becd9acf6109cf4.zip tk-3429267f021764f4911937b03becd9acf6109cf4.tar.gz tk-3429267f021764f4911937b03becd9acf6109cf4.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'win')
| -rw-r--r-- | win/tkWinPort.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/win/tkWinPort.h b/win/tkWinPort.h index 72ca0e0..955e9b8 100644 --- a/win/tkWinPort.h +++ b/win/tkWinPort.h @@ -95,11 +95,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 /* |