diff options
Diffstat (limited to '')
| -rw-r--r-- | source/Globals.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/Globals.h b/source/Globals.h index df72b25a8..78f847e2e 100644 --- a/source/Globals.h +++ b/source/Globals.h @@ -89,6 +89,10 @@ typedef short Int16; #define WIN32_LEAN_AND_MEAN
#include <Windows.h>
#include <winsock2.h>
+
+ // Windows SDK defines min and max macros, messing up with our std::min and std::max usage
+ #undef min
+ #undef max
#else
#include <sys/types.h>
#include <sys/stat.h> // for mkdir
@@ -176,6 +180,7 @@ typedef short Int16; +
/// A generic interface used mainly in ForEach() functions
template <typename Type> class cItemCallback
{
|