Fix msvc2012 build

diff --git a/src/profiler.h b/src/profiler.h
index e746c489c525355a92d188aeb864676fa505f468..25d89c6c8a6304fd77988ab50fc01189c0f5c5b3 100644 (file)
--- a/src/profiler.h
+++ b/src/profiler.h
@@ -22,9 +22,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "irrlichttypes.h"
 #include <string>
+#include <map>
+
 #include "jthread/jmutex.h"
 #include "jthread/jmutexautolock.h"
-#include <map>
 #include "util/timetaker.h"
 #include "util/numeric.h" // paging()
 #include "debug.h" // assert()
@@ -73,7 +74,7 @@ class Profiler
                        else{
                                /* No add shall have been used */
                                assert(n->second != -2);
-                               n->second = (std::max)(n->second, 0) + 1;
+                               n->second = MYMAX(n->second, 0) + 1;
                        }
                }
                {

diff --git a/src/util/string.h b/src/util/string.h
index 4aeea17dbb7e5bd6c6bfea66ccb10b316ee35354..6e2db0af46cbe58e1e037375239b59b509d92dec 100644 (file)
--- a/src/util/string.h
+++ b/src/util/string.h
@@ -26,6 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <cstring>
 #include <vector>
 #include <sstream>
+#include <cctype>
 
 #define STRINGIFY(x) #x
 #define TOSTRING(x) STRINGIFY(x)