summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-03-03 18:16:34 +0100
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-03-03 18:16:34 +0100
commit48a184a7304ac34bbb7942b19b12d2cc8cad6174 (patch)
tree8745cdb5afd894da29a7d92ba2079d712a1a90a3
parentca041dab3feb95e3b4a36dd2bec5c706166bb158 (diff)
parent822df36f252c5a16cdf82f5666f36e7011df46c4 (diff)
downloadqtscript-48a184a7304ac34bbb7942b19b12d2cc8cad6174.tar.gz
Merge remote-tracking branch 'origin/5.4' into 5.5
Change-Id: I09519da51f8c3cbc927f64f9b1bd7de14b8a1854
-rw-r--r--src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
index cd60d43..00caa6d 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
@@ -190,15 +190,19 @@
|| defined(_M_PPC) \
|| defined(__PPC)
#define WTF_CPU_PPC 1
+#ifndef __LITTLE_ENDIAN__
#define WTF_CPU_BIG_ENDIAN 1
#endif
+#endif
/* CPU(PPC64) - PowerPC 64-bit */
#if defined(__ppc64__) \
|| defined(__PPC64__)
#define WTF_CPU_PPC64 1
+#ifndef __LITTLE_ENDIAN__
#define WTF_CPU_BIG_ENDIAN 1
#endif
+#endif
/* CPU(SH4) - SuperH SH-4 */
#if defined(__SH4__)