From 1533b588e30554355dd4c2522679f1666d2fc32e Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Fri, 26 Jul 2013 01:18:40 +0200 Subject: [PATCH] Argh, this really shouldn't be needed but is. --- Common/CommonTypes.h | 6 ++++++ Core/Font/PGF.h | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/Common/CommonTypes.h b/Common/CommonTypes.h index 3befbb7f3..55e5458bd 100644 --- a/Common/CommonTypes.h +++ b/Common/CommonTypes.h @@ -54,6 +54,12 @@ typedef signed long long s64; #endif // _WIN32 + +#ifdef ANDROID +#undef BIG_ENDIAN +#undef __BIG_ENDIAN__ +#endif + #if !BIG_ENDIAN && !__BIG_ENDIAN__ typedef u32 u32_le; typedef u16 u16_le; diff --git a/Core/Font/PGF.h b/Core/Font/PGF.h index 909423d12..8815f4909 100644 --- a/Core/Font/PGF.h +++ b/Core/Font/PGF.h @@ -108,6 +108,12 @@ struct Glyph { u32 ptr; }; + +#ifdef ANDROID +#undef BIG_ENDIAN +#undef __BIG_ENDIAN__ +#endif + #if !BIG_ENDIAN && !__BIG_ENDIAN__ typedef FontPixelFormat FontPixelFormat_le; #else