diff options
| author | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-20 14:20:07 +0200 |
|---|---|---|
| committer | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-07-20 14:20:07 +0200 |
| commit | 3c630c0d90a8d997475c07bc52781126e5f531e6 (patch) | |
| tree | 27c6b62c2e8ca0a29438995b2f6b8c4d111521e5 /src/common_irrlicht.h | |
| parent | d0810b0156073833b9966672c86b5fc3650dade9 (diff) | |
| parent | 74ef5b8a42aacaeef4bffeef59a7fddb3e14c17c (diff) | |
| download | minetest-3c630c0d90a8d997475c07bc52781126e5f531e6.tar.gz minetest-3c630c0d90a8d997475c07bc52781126e5f531e6.tar.bz2 minetest-3c630c0d90a8d997475c07bc52781126e5f531e6.zip | |
Merge branch 'upstream/master'
Diffstat (limited to 'src/common_irrlicht.h')
| -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 |