From 74ef5b8a42aacaeef4bffeef59a7fddb3e14c17c Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Sun, 17 Jul 2011 19:32:06 +0300 Subject: [PATCH] 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. --- src/common_irrlicht.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/common_irrlicht.h b/src/common_irrlicht.h index 785f4fec7..7ce5d8db7 100644 --- a/src/common_irrlicht.h +++ b/src/common_irrlicht.h @@ -35,7 +35,15 @@ typedef core::vector2d v2s32; typedef core::vector2d v2u32; typedef core::vector2d v2f32; -typedef unsigned long long u64; +#ifdef _MSC_VER + // Windows + typedef unsigned long long u64; +#else + // Posix + #include + typedef uint64_t u64; + //typedef unsigned long long u64; +#endif #endif