diff options
| author | DannyDark <the_skeleton_of_a_child@yahoo.co.uk> | 2012-12-10 04:15:42 +0000 |
|---|---|---|
| committer | darkrose <lisa@ltmnet.com> | 2012-12-20 17:53:25 +1000 |
| commit | 40dac4cde4782943eb00f7bfc7ce2d99135be7c9 (patch) | |
| tree | 96adefa9ef390d870e65078a6507c2460b004971 /src | |
| parent | 05b58501f24ea0bcb6072f66f4ba3aa3ba907ab9 (diff) | |
| download | minetest-40dac4cde4782943eb00f7bfc7ce2d99135be7c9.tar.gz minetest-40dac4cde4782943eb00f7bfc7ce2d99135be7c9.tar.bz2 minetest-40dac4cde4782943eb00f7bfc7ce2d99135be7c9.zip | |
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+
Diffstat (limited to 'src')
| -rw-r--r-- | src/irrlichttypes.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/irrlichttypes.h b/src/irrlichttypes.h index 82177299e..998992e05 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 |