diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-07-17 19:32:06 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-07-17 19:32:06 +0300 |
| commit | 74ef5b8a42aacaeef4bffeef59a7fddb3e14c17c (patch) | |
| tree | 06c7200c7586bccac4aa6bb6ac4977411db166cc | |
| parent | 496e78398873794a95a57e38756399a8330b5c0c (diff) | |
| download | minetest-74ef5b8a42aacaeef4bffeef59a7fddb3e14c17c.tar.gz minetest-74ef5b8a42aacaeef4bffeef59a7fddb3e14c17c.tar.bz2 minetest-74ef5b8a42aacaeef4bffeef59a7fddb3e14c17c.zip | |
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.
| -rw-r--r-- | src/common_irrlicht.h | 10 |
1 files changed, 9 insertions, 1 deletions
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<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 |