From 230d061fb2c19dd0aedc91c8529db0a1ad94980f Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Thu, 25 Jul 2013 22:24:53 -0700 Subject: [PATCH 1/2] When possible always use a runtime check for endian. --- util/text/utf16.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/util/text/utf16.h b/util/text/utf16.h index 174ec163e1..75f8b3ee02 100644 --- a/util/text/utf16.h +++ b/util/text/utf16.h @@ -2,14 +2,8 @@ #include "base/basictypes.h" -#if defined(__LITTLE_ENDIAN__) -#define UTF16_IS_LITTLE_ENDIAN 1 -#elif defined(__BIG_ENDIAN__) -#define UTF16_IS_LITTLE_ENDIAN 0 -#else // Should optimize out. #define UTF16_IS_LITTLE_ENDIAN (*(const uint16_t *)"\0\xff" >= 0x100) -#endif template uint16_t UTF16_Swap(uint16_t u) { From f72b981395c31b566270d7c3125c981e3263adb7 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Thu, 25 Jul 2013 22:34:09 -0700 Subject: [PATCH 2/2] iOS buildfix. --- gfx_es2/gl_state.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gfx_es2/gl_state.cpp b/gfx_es2/gl_state.cpp index d4506aca4d..02da1b34ec 100644 --- a/gfx_es2/gl_state.cpp +++ b/gfx_es2/gl_state.cpp @@ -5,7 +5,7 @@ #endif -#ifdef USING_GLES2 +#if defined(USING_GLES2) && !defined(IOS) PFNGLALPHAFUNCQCOMPROC glAlphaFuncQCOM; #endif