summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2014-05-02 22:47:04 -0400
committerLioncash <mathew1800@gmail.com>2014-05-29 21:44:41 -0400
commit49b0eef393f4d321928fb0b6093d58a7637cf1da (patch)
tree741357c06acd966494684f8fdd4ec89e961d9887 /Source/Core/InputCommon
parent30973459292d734fac12d1fefaf98edf37ad7976 (diff)
Remove the min/max functions in CommonFuncs.
The algorithm header has the same functions.
Diffstat (limited to 'Source/Core/InputCommon')
-rw-r--r--Source/Core/InputCommon/stdafx.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/Core/InputCommon/stdafx.h b/Source/Core/InputCommon/stdafx.h
index 613c8995a2..cd18106bfc 100644
--- a/Source/Core/InputCommon/stdafx.h
+++ b/Source/Core/InputCommon/stdafx.h
@@ -10,5 +10,6 @@
#endif
*/
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
+#define NOMINMAX // Don't include windows min/max definitions
#include <algorithm>