Bug 820172 - Fix android build when building with gcc 4.6. r=ehsan

2012-12-11 01:08:27 -05:00
parent fea3c55db1
commit 0fe97a385a
1 changed files with 2 additions and 2 deletions
--- a/parser/html/jArray.h
+++ b/parser/html/jArray.h
@@ -101,8 +101,8 @@ class autoJArray {
      length = other.length;
    }
 #if defined(MOZ_HAVE_CXX11_NULLPTR)
-#  if defined(__clang__)
-    // clang on OS X 10.7 does not have std::nullptr_t
+#  if defined(__clang__) || defined(__ANDROID__)
+    // clang on OS X 10.7 and gcc-4.6 on android does not have std::nullptr_t
    typedef decltype(nullptr) jArray_nullptr_t;
 #  else
    // decltype(nullptr) does not evaluate to std::nullptr_t on GCC 4.6.3