Android: bypass broken wide_to_utf8 with wide_to_narrow (again)

[minetest.git] / src / irrlichttypes.h

diff --git a/src/irrlichttypes.h b/src/irrlichttypes.h
index 195c3cc0cf86ef08bbdd7ee2d2740a42172d4b64..bead64407ed1717e7df21f7758fb27bbc0f28483 100644 (file)
--- a/src/irrlichttypes.h
+++ b/src/irrlichttypes.h
@@ -1,6 +1,6 @@
 /*
 Minetest
-Copyright (C) 2010-2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+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,6 +20,17 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef IRRLICHTTYPES_HEADER
 #define IRRLICHTTYPES_HEADER
 
+/* 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
+
 #include <irrTypes.h>
 
 using namespace irr;
@@ -32,11 +43,9 @@ using namespace irr;
        typedef unsigned long long u64;
 #else
        // Posix
-       #include <stdint.h>
        typedef int64_t s64;
        typedef uint64_t u64;
 #endif
 #endif
 
 #endif
-