aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Puchkin <i@neoascetic.me>2014-12-09 20:40:09 +1000
committerCraig Robbins <kde.psych@gmail.com>2014-12-09 20:40:52 +1000
commita1ea017b512ea8f99c40dca52a57ff58054c5acc (patch)
treedafa20a1a53963d49ebcafb5a7c6336985aab588
parent941d000fc62fd07cc058f6bc663a56843dc8591e (diff)
downloadminetest-a1ea017b512ea8f99c40dca52a57ff58054c5acc.tar.gz
minetest-a1ea017b512ea8f99c40dca52a57ff58054c5acc.tar.bz2
minetest-a1ea017b512ea8f99c40dca52a57ff58054c5acc.zip
Fix builds failing on BSD-like (such as OSX) due to an irrlicht bug (temporary fix)
Details: - https://sourceforge.net/p/irrlicht/bugs/433/ - https://github.com/minetest/minetest/issues/1687#issuecomment-61368769 - https://forum.minetest.net/viewtopic.php?f=42&t=9190&start=125#p159364 In case when "settings.h" is included from "emerge.cpp" or "environment.cpp", u64 type has "unsigned long" length because previously <stdint> was included. When "settings.h" is included from "settings.cpp", u64 has "unsigned long long" length because no <stdint> was included previously. This leads to different signatures of "setU64" method and linker cannot find appropriate symbol. The best fix of this bug should be done in the Irrlicht, but as hotfix I think this is OK and better than types changing. Previously this bug didn't appear because there was no "settings.cpp" file and implementation of all methods was done in the header file.
-rw-r--r--src/irrlichttypes.h13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/irrlichttypes.h b/src/irrlichttypes.h
index 7da1a4bd2..bead64407 100644
--- a/src/irrlichttypes.h
+++ b/src/irrlichttypes.h
@@ -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
-