Index: mozilla/gfx/skia/trunk/include/core/SkPreConfig.h
===================================================================
--- mozilla.orig/gfx/skia/trunk/include/core/SkPreConfig.h
+++ mozilla/gfx/skia/trunk/include/core/SkPreConfig.h
@@ -92,6 +92,14 @@
 //////////////////////////////////////////////////////////////////////
 
 #if !defined(SK_CPU_BENDIAN) && !defined(SK_CPU_LENDIAN)
+    #if defined(__BIG_ENDIAN__)
+         #define SK_CPU_BENDIAN
+    #elif defined(__LITTLE_ENDIAN__)
+        #define SK_CPU_LENDIAN
+    #endif
+#endif
+
+#if !defined(SK_CPU_BENDIAN) && !defined(SK_CPU_LENDIAN)
     #if defined(__sparc) || defined(__sparc__) || \
       defined(_POWER) || defined(__powerpc__) || \
       defined(__ppc__) || defined(__hppa) || \
Index: mozilla/js/src/jsdtoa.cpp
===================================================================
--- mozilla.orig/js/src/jsdtoa.cpp
+++ mozilla/js/src/jsdtoa.cpp
@@ -52,6 +52,7 @@ static inline void dtoa_free(void* p) {
 #define MALLOC dtoa_malloc
 #define FREE dtoa_free
 #include "dtoa.c"
+#undef CONST
 
 /* Mapping of JSDToStrMode -> js_dtoa mode */
 static const uint8_t dtoaModes[] = {