diff options
| author | shuffle2 <godisgovernment@gmail.com> | 2014-05-29 20:10:01 -0700 |
|---|---|---|
| committer | shuffle2 <godisgovernment@gmail.com> | 2014-05-29 20:10:01 -0700 |
| commit | 8fc83d8ffca75f86c144a7798ebf0661a1eb68ef (patch) | |
| tree | 741357c06acd966494684f8fdd4ec89e961d9887 /Source/Core/InputCommon | |
| parent | 30973459292d734fac12d1fefaf98edf37ad7976 (diff) | |
| parent | 49b0eef393f4d321928fb0b6093d58a7637cf1da (diff) | |
Merge pull request #334 from lioncash/use-std-minmax
Remove the min/max functions in CommonFuncs.
Diffstat (limited to 'Source/Core/InputCommon')
| -rw-r--r-- | Source/Core/InputCommon/stdafx.h | 1 |
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> |