X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;ds=sidebyside;f=src%2Firrlichttypes.h;h=bead64407ed1717e7df21f7758fb27bbc0f28483;hb=c5f6f9f77ac1df4b223649fcaca9a66333aa8786;hp=8f3eb14648b83e40f80a02b7feb06df2554b1675;hpb=037b2591971d752e67fa7d47095b996b3f56da5a;p=dragonfireclient.git

diff --git a/src/irrlichttypes.h b/src/irrlichttypes.h
index 8f3eb1464..bead64407 100644
--- a/src/irrlichttypes.h
+++ b/src/irrlichttypes.h
@@ -1,6 +1,6 @@
 /*
-Minetest-c55
-Copyright (C) 2010-2011 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
@@ -20,36 +20,32 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef IRRLICHTTYPES_HEADER
 #define IRRLICHTTYPES_HEADER
 
-#include <irrTypes.h>
-#include <vector2d.h>
-#include <vector3d.h>
-#include <irrMap.h>
-#include <irrList.h>
-#include <irrArray.h>
-#include <aabbox3d.h>
-#include <SColor.h>
-using namespace irr;
-typedef core::vector3df v3f;
-typedef core::vector3d<s16> v3s16;
-typedef core::vector3d<s32> v3s32;
+/* Ensure that <stdint.h> is included before <irrTypes.h>, unless building on
+ * MSVC, to address an irrlicht issue: https://sourceforge.net/p/irrlicht/bugs/433/
+ *
+ * TODO: Decide whether or not we support non-compliant C++ compilers like old
+ *       versions of MSCV.  If we do not then <stdint.h> can always be included
+ *       regardless of the compiler.
+ */
+#ifndef _MSC_VER
+#	include <stdint.h>
+#endif
 
-typedef core::vector2d<f32> v2f;
-typedef core::vector2d<s16> v2s16;
-typedef core::vector2d<s32> v2s32;
-typedef core::vector2d<u32> v2u32;
-typedef core::vector2d<f32> v2f32;
+#include <irrTypes.h>
 
-typedef core::aabbox3d<f32> aabb3f;
+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