From: sapier <Sapier at GMX dot net>
Date: Sun, 29 Jun 2014 14:57:50 +0000 (+0200)
Subject: Fix msvc2012 build
X-Git-Tag: 0.4.10~26
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ee7af21e411d5d43ba67f4b67603f72e62b0570d;p=oweals%2Fminetest.git

Fix msvc2012 build
---

diff --git a/src/profiler.h b/src/profiler.h
index e746c489c..25d89c6c8 100644
--- 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 @@ public:
 			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 4aeea17db..6e2db0af4 100644
--- 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)