Calinou
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix msvc2012 build

master
sapier 2014-06-29 16:57:50 +02:00
parent ebf7ea5019
commit ee7af21e41
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/profiler.h
View File

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

1
src/util/string.h
View File

@ -26,6 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <cstring> #include <cstring>
#include <vector> #include <vector>
#include <sstream> #include <sstream>
#include <cctype>
#define STRINGIFY(x) #x #define STRINGIFY(x) #x
#define TOSTRING(x) STRINGIFY(x) #define TOSTRING(x) STRINGIFY(x)