|
940
|
1 |
|
|
|
2 |
# HG changeset patch
|
|
|
3 |
# User Mike Hommey <mh+mozilla@glandium.org>
|
|
|
4 |
# Date 1479812942 -32400
|
|
|
5 |
# Node ID a6d015fd1add5e16cf37f5868cd2734bafb709b4
|
|
|
6 |
# Parent 319e03b9e8a22a8fba3756cb1afc8b9e7a6724c8
|
|
|
7 |
Bug 1319389 - Generically set SK_CPU_[BL]ENDIAN based on __BYTE_ORDER__ when available. r?jrmuizel
|
|
|
8 |
|
|
|
9 |
|
|
|
10 |
diff --git a/gfx/skia/skia/include/core/SkPreConfig.h b/gfx/skia/skia/include/core/SkPreConfig.h
|
|
|
11 |
--- a/gfx/skia/skia/include/core/SkPreConfig.h
|
|
|
12 |
+++ b/gfx/skia/skia/include/core/SkPreConfig.h
|
|
|
13 |
@@ -67,25 +67,29 @@
|
|
|
14 |
|
|
|
15 |
#if !defined(SK_WARN_UNUSED_RESULT)
|
|
|
16 |
#define SK_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
|
|
|
17 |
#endif
|
|
|
18 |
|
|
|
19 |
//////////////////////////////////////////////////////////////////////
|
|
|
20 |
|
|
|
21 |
#if !defined(SK_CPU_BENDIAN) && !defined(SK_CPU_LENDIAN)
|
|
|
22 |
- #if defined(__sparc) || defined(__sparc__) || \
|
|
|
23 |
+ #if defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
|
|
|
24 |
+ #define SK_CPU_BENDIAN
|
|
|
25 |
+ #elif defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
|
|
|
26 |
+ #define SK_CPU_LENDIAN
|
|
|
27 |
+ #elif defined(__sparc) || defined(__sparc__) || \
|
|
|
28 |
defined(_POWER) || defined(__powerpc__) || \
|
|
|
29 |
defined(__ppc__) || defined(__hppa) || \
|
|
|
30 |
defined(__PPC__) || defined(__PPC64__) || \
|
|
|
31 |
defined(_MIPSEB) || defined(__ARMEB__) || \
|
|
|
32 |
defined(__s390__) || \
|
|
|
33 |
(defined(__sh__) && defined(__BIG_ENDIAN__)) || \
|
|
|
34 |
(defined(__ia64) && defined(__BIG_ENDIAN__))
|
|
|
35 |
- #define SK_CPU_BENDIAN
|
|
|
36 |
+ #define SK_CPU_BENDIAN
|
|
|
37 |
#else
|
|
|
38 |
#define SK_CPU_LENDIAN
|
|
|
39 |
#endif
|
|
|
40 |
#endif
|
|
|
41 |
|
|
|
42 |
//////////////////////////////////////////////////////////////////////
|
|
|
43 |
|
|
|
44 |
#if defined(__i386) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_X64)
|
|
|
45 |
|