--- a/parser/html/jArray.h
+++ b/parser/html/jArray.h
@@ -96,18 +96,18 @@ class autoJArray {
       return newArray;
     }
     void operator=(const jArray<T,L>& other) {
       delete[] arr;
       arr = other.arr;
       length = other.length;
     }
 #if defined(MOZ_HAVE_CXX11_NULLPTR)
-#  if defined(__clang__) || defined(__ANDROID__)
-    // clang on OS X 10.7 and gcc-4.6 on android does not have std::nullptr_t
+#  if defined(__clang__) || defined(_STLPORT_VERSION)
+    // clang on OS X 10.7 and Android's STLPort do 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
     typedef std::nullptr_t jArray_nullptr_t;
 #  endif
 #elif defined(__GNUC__)
     typedef void* jArray_nullptr_t;
 #elif defined(_WIN64)