1 # HG changeset patch |
|
2 # Parent 2cf5e1715c64a30c340872b58816c3a329bd12dc |
|
3 Part 2 of |
|
4 Bug 1136958 - gfx/layers/basic/BasicCompositor.cpp:20:56: fatal error: skia/SkCanvas.h: No such file or directory when skia is disabled |
|
5 |
|
6 diff --git a/gfx/skia/trunk/include/core/SkPreConfig.h b/gfx/skia/trunk/include/core/SkPreConfig.h |
|
7 --- a/gfx/skia/trunk/include/core/SkPreConfig.h |
|
8 +++ b/gfx/skia/trunk/include/core/SkPreConfig.h |
|
9 @@ -87,16 +87,24 @@ |
|
10 |
|
11 #if !defined(SK_WARN_UNUSED_RESULT) |
|
12 #define SK_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) |
|
13 #endif |
|
14 |
|
15 ////////////////////////////////////////////////////////////////////// |
|
16 |
|
17 #if !defined(SK_CPU_BENDIAN) && !defined(SK_CPU_LENDIAN) |
|
18 + #if defined(__BIG_ENDIAN__) |
|
19 + #define SK_CPU_BENDIAN |
|
20 + #elif defined(__LITTLE_ENDIAN__) |
|
21 + #define SK_CPU_LENDIAN |
|
22 + #endif |
|
23 +#endif |
|
24 + |
|
25 +#if !defined(SK_CPU_BENDIAN) && !defined(SK_CPU_LENDIAN) |
|
26 #if defined(__sparc) || defined(__sparc__) || \ |
|
27 defined(_POWER) || defined(__powerpc__) || \ |
|
28 defined(__ppc__) || defined(__hppa) || \ |
|
29 defined(__PPC__) || defined(__PPC64__) || \ |
|
30 defined(_MIPSEB) || defined(__ARMEB__) || \ |
|
31 defined(__s390__) || \ |
|
32 (defined(__sh__) && defined(__BIG_ENDIAN__)) || \ |
|
33 (defined(__ia64) && defined(__BIG_ENDIAN__)) |
|
34 diff --git a/js/src/jsdtoa.cpp b/js/src/jsdtoa.cpp |
|
35 --- a/js/src/jsdtoa.cpp |
|
36 +++ b/js/src/jsdtoa.cpp |
|
37 @@ -47,16 +47,17 @@ using namespace js; |
|
38 static inline void* dtoa_malloc(size_t size) { return js_malloc(size); } |
|
39 static inline void dtoa_free(void* p) { return js_free(p); } |
|
40 |
|
41 #define NO_GLOBAL_STATE |
|
42 #define NO_ERRNO |
|
43 #define MALLOC dtoa_malloc |
|
44 #define FREE dtoa_free |
|
45 #include "dtoa.c" |
|
46 +#undef CONST |
|
47 |
|
48 /* Mapping of JSDToStrMode -> js_dtoa mode */ |
|
49 static const uint8_t dtoaModes[] = { |
|
50 0, /* DTOSTR_STANDARD */ |
|
51 0, /* DTOSTR_STANDARD_EXPONENTIAL, */ |
|
52 3, /* DTOSTR_FIXED, */ |
|
53 2, /* DTOSTR_EXPONENTIAL, */ |
|
54 2}; /* DTOSTR_PRECISION */ |
|