diff options
| author | sfan5 <sfan5@live.de> | 2021-03-31 13:15:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-31 13:15:47 +0200 |
| commit | 1e4913cd76f5d31456d04a5ce23e66d5c60060de (patch) | |
| tree | b97fe77b159d158d88ff87df59effd821c0b2e1d /src/irrlichttypes.h | |
| parent | 0d90ed6d921baefbb1a969df69f7b86e702e962f (diff) | |
| download | minetest-1e4913cd76f5d31456d04a5ce23e66d5c60060de.tar.gz minetest-1e4913cd76f5d31456d04a5ce23e66d5c60060de.tar.bz2 minetest-1e4913cd76f5d31456d04a5ce23e66d5c60060de.zip | |
Irrlicht support code maintenance
Diffstat (limited to 'src/irrlichttypes.h')
| -rw-r--r-- | src/irrlichttypes.h | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/src/irrlichttypes.h b/src/irrlichttypes.h index 794776b26..93c2d105b 100644 --- a/src/irrlichttypes.h +++ b/src/irrlichttypes.h @@ -19,16 +19,11 @@ with this program; if not, write to the Free Software Foundation, Inc., #pragma once -/* 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. +/* + * IrrlichtMt already includes stdint.h in irrTypes.h. This works everywhere + * we need it to (including recent MSVC), so should be fine here too. */ -#ifndef _MSC_VER -# include <cstdint> -#endif +#include <cstdint> #include <irrTypes.h> @@ -36,19 +31,6 @@ using namespace irr; 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 - #if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR >= 9) namespace core { template <typename T> |