From: DannyDark <the_skeleton_of_a_child@yahoo.co.uk>
Date: Mon, 10 Dec 2012 04:15:42 +0000 (+0000)
Subject: Fixed u64 ambiguous symbol error
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=40dac4cde4782943eb00f7bfc7ce2d99135be7c9;p=zefram%2Fminetest%2Fminetest_engine.git

Fixed u64 ambiguous symbol error

Fixed the compiler not being able to determine which symbol it should
use when compiling Minetest as 64bit with Irrlicht 1.8+
---

diff --git a/src/irrlichttypes.h b/src/irrlichttypes.h
index 82177299..998992e0 100644
--- a/src/irrlichttypes.h
+++ b/src/irrlichttypes.h
@@ -24,6 +24,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 using namespace irr;
 
+// Irrlicht 1.8+ defines 64bit unsigned symbol in irrTypes.h
+#if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 8)
 #ifdef _MSC_VER
 	// Windows
 	typedef unsigned long long u64;
@@ -33,6 +35,7 @@ using namespace irr;
 	typedef uint64_t u64;
 	//typedef unsigned long long u64;
 #endif
+#endif
 
 #endif