Fix: warnings when compiling for a recent version of Haiku

This might break older Haiku versions, but it is hard to tell.
This commit is contained in:
Patric Stout
2019-03-04 20:51:46 +01:00
parent aa350528df
commit 1c5ea33099
4 changed files with 13 additions and 12 deletions

View File

@@ -309,12 +309,18 @@ typedef unsigned char byte;
#endif
#if defined(TROUBLED_INTS)
/* Haiku's types for uint32/int32 are based on longs, which causes
* trouble all over the place in OpenTTD. */
#define uint32 uint32_ugly_hack
#define int32 int32_ugly_hack
/* Haiku's types for uint32/int32/uint64/int64 are different than what
* they are on other platforms; not in length, but how to print them.
* So make them more like the other platforms, to make printf() etc a
* little bit easier. */
# define uint32 uint32_ugly_hack
# define int32 int32_ugly_hack
# define uint64 uint64_ugly_hack
# define int64 int64_ugly_hack
typedef unsigned int uint32_ugly_hack;
typedef signed int int32_ugly_hack;
typedef unsigned __int64 uint64_ugly_hack;
typedef signed __int64 int64_ugly_hack;
#else
typedef unsigned char uint8;
typedef signed char int8;