summaryrefslogtreecommitdiffstats
path: root/source/Globals.h
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-06-02 16:20:22 +0200
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-06-02 16:20:22 +0200
commit018d941daf310e5f79c4c102d075149ba4dfe50f (patch)
treeabfce0c3c5e968b01a77f75569c074940dad60ae /source/Globals.h
parentAdded a cHeiGenCache object for caching generated heightmaps. World generation is now about twice as fast as before Rev 535 :) (diff)
downloadcuberite-018d941daf310e5f79c4c102d075149ba4dfe50f.tar
cuberite-018d941daf310e5f79c4c102d075149ba4dfe50f.tar.gz
cuberite-018d941daf310e5f79c4c102d075149ba4dfe50f.tar.bz2
cuberite-018d941daf310e5f79c4c102d075149ba4dfe50f.tar.lz
cuberite-018d941daf310e5f79c4c102d075149ba4dfe50f.tar.xz
cuberite-018d941daf310e5f79c4c102d075149ba4dfe50f.tar.zst
cuberite-018d941daf310e5f79c4c102d075149ba4dfe50f.zip
Diffstat (limited to 'source/Globals.h')
-rw-r--r--source/Globals.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/source/Globals.h b/source/Globals.h
index df72b25a8..78f847e2e 100644
--- a/source/Globals.h
+++ b/source/Globals.h
@@ -89,6 +89,10 @@ typedef short Int16;
#define WIN32_LEAN_AND_MEAN
#include <Windows.h>
#include <winsock2.h>
+
+ // Windows SDK defines min and max macros, messing up with our std::min and std::max usage
+ #undef min
+ #undef max
#else
#include <sys/types.h>
#include <sys/stat.h> // for mkdir
@@ -176,6 +180,7 @@ typedef short Int16;
+
/// A generic interface used mainly in ForEach() functions
template <typename Type> class cItemCallback
{