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/VideoBackends/OGL | |
| 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/VideoBackends/OGL')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/stdafx.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/Core/VideoBackends/OGL/stdafx.h b/Source/Core/VideoBackends/OGL/stdafx.h index 81bb44dc19..d245b07645 100644 --- a/Source/Core/VideoBackends/OGL/stdafx.h +++ b/Source/Core/VideoBackends/OGL/stdafx.h @@ -5,8 +5,10 @@ #pragma once #define _WIN32_WINNT 0x501 #ifndef _WIN32_IE -#define _WIN32_IE 0x0500 // Default value is 0x0400 +#define _WIN32_IE 0x0500 // Default value is 0x0400 #endif +#define NOMINMAX // Don't include windows min/max definitions + #include <tchar.h> #include <windows.h> |
