minetest/irrlicht
1
0
Fork 0
mirror of https://github.com/minetest/irrlicht.git synced 2024-12-25 02:00:30 +01:00
Code Issues Projects Releases Wiki Activity

Fix: 64 bit integer typedefs have different definitions in different compilation units Mac OS

Browse Source 
Thanks @edo9300 for reporting: https://irrlicht.sourceforge.io/forum/viewtopic.php?f=7&t=52795
This is also once more trying to fix bug #433


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6278 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien 2022-01-04 18:44:35 +00:00
parent dadbf64a8c
commit 66f9511745
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/irrTypes.h
View File

@ -8,7 +8,8 @@
#include "IrrCompileConfig.h" #include "IrrCompileConfig.h"
#if defined(__GNUC__) #if defined(__GNUC__)
#include <limits.h> // for __WORDSIZE // For __WORDSIZE (which we maybe don't even need anymore with LP64 checks now)
#include <limits.h>
#endif #endif
namespace irr namespace irr
@ -77,7 +78,7 @@ typedef signed int s32;
#if defined(_MSC_VER) || ((__BORLANDC__ >= 0x530) && !defined(__STRICT_ANSI__)) #if defined(_MSC_VER) || ((__BORLANDC__ >= 0x530) && !defined(__STRICT_ANSI__))
typedef unsigned __int64 u64; typedef unsigned __int64 u64;
#elif defined(__GNUC__) #elif defined(__GNUC__)
#if defined(__WORDSIZE) && __WORDSIZE == 64 #if (defined(__LP64__) && __LP64__ == 1) || (defined(_LP64) && _LP64 == 1) || (defined(__WORDSIZE) && __WORDSIZE == 64)
typedef unsigned long int u64; typedef unsigned long int u64;
#else #else
__extension__ typedef unsigned long long u64; __extension__ typedef unsigned long long u64;
@ -91,7 +92,7 @@ typedef unsigned long long u64;
#if defined(_MSC_VER) || ((__BORLANDC__ >= 0x530) && !defined(__STRICT_ANSI__)) #if defined(_MSC_VER) || ((__BORLANDC__ >= 0x530) && !defined(__STRICT_ANSI__))
typedef __int64 s64; typedef __int64 s64;
#elif defined(__GNUC__) #elif defined(__GNUC__)
#if defined(__WORDSIZE) && __WORDSIZE == 64 #if (defined(__LP64__) && __LP64__ == 1) || (defined(_LP64) && _LP64 == 1) || (defined(__WORDSIZE) && __WORDSIZE == 64)
typedef long int s64; typedef long int s64;
#else #else
__extension__ typedef long long s64; __extension__ typedef long long s64;