diff options
| author | michi_cc <michi_cc@openttd.org> | 2012-07-19 19:06:27 +0000 |
|---|---|---|
| committer | michi_cc <michi_cc@openttd.org> | 2012-07-19 19:06:27 +0000 |
| commit | 1792c186c7d942b1c28f0382bf7caa685d8c72af (patch) | |
| tree | 528f2062ff47aff4ad711aef28a8d0a87ea45c60 | |
| parent | 902e2e4f6679c37bd9b08f32af1600562731f644 (diff) | |
| download | openttd-1792c186c7d942b1c28f0382bf7caa685d8c72af.tar.xz | |
(svn r24416) -Fix [FS#5231]: [Win32] Unbreak NewGRF MD5 sum calculation. Macros and side effects don't mix, especially if there's some obscure '#define min' in a windows header that nobody thinks of.
| -rw-r--r-- | src/stdafx.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/stdafx.h b/src/stdafx.h index 68f7b5d88..1c804220e 100644 --- a/src/stdafx.h +++ b/src/stdafx.h @@ -163,6 +163,7 @@ #define WINVER 0x0400 // Windows NT 4.0 / Windows 95 #endif #define _WIN32_IE_ 0x0401 // 4.01 (win98 and NT4SP5+) + #define NOMINMAX // Disable min/max macros in windows.h. #pragma warning(disable: 4244) // 'conversion' conversion from 'type1' to 'type2', possible loss of data #pragma warning(disable: 4761) // integral size mismatch in argument : conversion supplied |