diff options
| author | sapier <Sapier at GMX dot net> | 2014-06-29 16:57:50 +0200 |
|---|---|---|
| committer | sapier <Sapier at GMX dot net> | 2014-06-29 16:57:50 +0200 |
| commit | ee7af21e411d5d43ba67f4b67603f72e62b0570d (patch) | |
| tree | f1fae4da26266e90c47574a6a853f23ad79526c7 | |
| parent | ebf7ea50193afe5a3d0968b87b4743eb1ee84025 (diff) | |
| download | minetest-ee7af21e411d5d43ba67f4b67603f72e62b0570d.tar.gz minetest-ee7af21e411d5d43ba67f4b67603f72e62b0570d.tar.bz2 minetest-ee7af21e411d5d43ba67f4b67603f72e62b0570d.zip | |
Fix msvc2012 build
| -rw-r--r-- | src/profiler.h | 5 | ||||
| -rw-r--r-- | src/util/string.h | 1 |
2 files changed, 4 insertions, 2 deletions
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) |