X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Firrlichttypes.h;h=7da1a4bd2601073645d477db3e3f58aeccd85ca4;hb=18bfa1c785a123499ee12d0551a9447a4d32d93b;hp=82177299eaad932f02cfcf6ea5407be50328dd46;hpb=9f031a67594162a53b07acbfbc65faf8c4938e99;p=oweals%2Fminetest.git

diff --git a/src/irrlichttypes.h b/src/irrlichttypes.h
index 82177299e..7da1a4bd2 100644
--- a/src/irrlichttypes.h
+++ b/src/irrlichttypes.h
@@ -1,6 +1,6 @@
 /*
-Minetest-c55
-Copyright (C) 2010-2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -24,14 +24,18 @@ 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 long long s64;
 	typedef unsigned long long u64;
 #else
 	// Posix
 	#include <stdint.h>
+	typedef int64_t s64;
 	typedef uint64_t u64;
-	//typedef unsigned long long u64;
+#endif
 #endif
 
 #endif