diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-15 01:00:11 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-11-15 16:30:51 +0100 |
| commit | 5abb976f23ef0f3cbb7b720e523c08d768c76c0e (patch) | |
| tree | 55fece450d39fdaf2fb2e213fc321fcf936a18cb /src/3rdparty/freetype | |
| parent | 76a0f94a6d7d85f352e3d4a00c192bfc377cc776 (diff) | |
| parent | adc7bbe910a4b89a579ffa93da5a937cfc1379f4 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'src/3rdparty/freetype')
| -rw-r--r-- | src/3rdparty/freetype/src/sfnt/pngshim.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/3rdparty/freetype/src/sfnt/pngshim.c b/src/3rdparty/freetype/src/sfnt/pngshim.c index ca85d9751f..fc78b6d5df 100644 --- a/src/3rdparty/freetype/src/sfnt/pngshim.c +++ b/src/3rdparty/freetype/src/sfnt/pngshim.c @@ -68,6 +68,7 @@ ( ( __clang_major__ >= 4 ) || \ ( ( __clang_major__ == 3 ) && ( __clang_minor__ >= 2 ) ) ) ) ) && \ defined( __OPTIMIZE__ ) && \ + !defined( __EMSCRIPTEN__ ) && \ __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ #ifdef __clang__ |