From 018d941daf310e5f79c4c102d075149ba4dfe50f Mon Sep 17 00:00:00 2001
From: "madmaxoft@gmail.com"
 <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>
Date: Sat, 2 Jun 2012 14:20:22 +0000
Subject: Fixed Linux compilation complaining about min() and max(), hopefully
 forever. Use std::min() and std::max()

git-svn-id: http://mc-server.googlecode.com/svn/trunk@539 0a769ca7-a7f5-676a-18bf-c427514a06d6
---
 source/Globals.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'source/Globals.h')

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
 {
-- 
cgit v1.2.3