summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2013-09-27 21:39:16 (GMT)
committer jacob1 <jfu614@gmail.com>2013-09-27 21:39:16 (GMT)
commit48f1adb0385c313f3ce1a4c183c16be3bb7b27cb (patch)
tree2c92ba19ed99f51e7d3f2e3de3e63f38a96509ca
parentbc6a380c4c98e9c55d5d33c49c06d31b2ce6a07d (diff)
downloadpowder-48f1adb0385c313f3ce1a4c183c16be3bb7b27cb.zip
powder-48f1adb0385c313f3ce1a4c183c16be3bb7b27cb.tar.gz
fix min and max in VS2013
-rw-r--r--src/Config.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/Config.h b/src/Config.h
index 587b389..c75bc8d 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -169,10 +169,14 @@ extern unsigned char ZSIZE;
#define strcasecmp stricmp
#endif
#if defined(_MSC_VER)
+#if _MSC_VER < 1800
#define fmin min
#define fminf min
#define fmax max
#define fmaxf max
+#else
+#include <algorithm>
+#endif
#endif
#if defined(_MSC_VER)