summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormichi_cc <michi_cc@openttd.org>2012-07-19 19:06:27 +0000
committermichi_cc <michi_cc@openttd.org>2012-07-19 19:06:27 +0000
commit1792c186c7d942b1c28f0382bf7caa685d8c72af (patch)
tree528f2062ff47aff4ad711aef28a8d0a87ea45c60
parent902e2e4f6679c37bd9b08f32af1600562731f644 (diff)
downloadopenttd-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.h1
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