From: Perttu Ahola <celeron55@gmail.com>
Date: Sun, 17 Jul 2011 16:32:06 +0000 (+0300)
Subject: Hopefully fixed u64 to be the actual 64-bit type on 64-bit architectures. This should... 
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=74ef5b8a42aacaeef4bffeef59a7fddb3e14c17c;p=zefram%2Fminetest%2Fminetest_engine.git

Hopefully fixed u64 to be the actual 64-bit type on 64-bit architectures. This should fix the compiler error caused by irrlicht on 64-bit fedora defining u64 to be different.
---

diff --git a/src/common_irrlicht.h b/src/common_irrlicht.h
index 785f4fec..7ce5d8db 100644
--- a/src/common_irrlicht.h
+++ b/src/common_irrlicht.h
@@ -35,7 +35,15 @@ typedef core::vector2d<s32> v2s32;
 typedef core::vector2d<u32> v2u32;
 typedef core::vector2d<f32> v2f32;
 
-typedef unsigned long long u64;
+#ifdef _MSC_VER
+	// Windows
+	typedef unsigned long long u64;
+#else
+	// Posix
+	#include <stdint.h>
+	typedef uint64_t u64;
+	//typedef unsigned long long u64;
+#endif
 
 #endif