diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-08-17 06:18:14 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-08-17 06:18:14 (GMT) |
| commit | 560a6b03e7e93607af6c0748938e380f86938b2a (patch) | |
| tree | 6815af5291b35a82b44cdaaee8250de57e3e2ec0 /win | |
| parent | e6279912ba852370baf9d434e5985b355430daad (diff) | |
| parent | 3429267f021764f4911937b03becd9acf6109cf4 (diff) | |
| download | tk-560a6b03e7e93607af6c0748938e380f86938b2a.zip tk-560a6b03e7e93607af6c0748938e380f86938b2a.tar.gz tk-560a6b03e7e93607af6c0748938e380f86938b2a.tar.bz2 | |
Merge trunk
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 /* |