mirror of
https://github.com/minetest/minetest.git
synced 2024-09-17 19:08:35 +02:00
a1ea017b51
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.
52 lines
1.6 KiB
C++
52 lines
1.6 KiB
C++
/*
|
|
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
|
|
the Free Software Foundation; either version 2.1 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public License along
|
|
with this program; if not, write to the Free Software Foundation, Inc.,
|
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
#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;
|
|
|
|
// 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
|
|
typedef int64_t s64;
|
|
typedef uint64_t u64;
|
|
#endif
|
|
#endif
|
|
|
|
#endif
|