wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 820435 - Fix the B2G builds on gcc-4.6 (NDK r8) due to missing std::nullptr_t in STLPort; r=ehsan

Browse Source 
--HG--
extra : rebase_source : e5fd2c6d1f3c0c817374b0fbf6471e14171f04b4
This commit is contained in:
Juan Gomez 2012-12-11 20:29:00 -05:00
parent 53c9d7b883
commit 22cd8de7ad
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
parser/html/jArray.h
View File

@ -101,8 +101,8 @@ class autoJArray {
length = other.length; length = other.length;
} }
#if defined(MOZ_HAVE_CXX11_NULLPTR) #if defined(MOZ_HAVE_CXX11_NULLPTR)
# if defined(__clang__) || defined(__ANDROID__) # if defined(__clang__) || defined(_STLPORT_VERSION)
// clang on OS X 10.7 and gcc-4.6 on android does not have std::nullptr_t // clang on OS X 10.7 and Android's STLPort do not have std::nullptr_t
typedef decltype(nullptr) jArray_nullptr_t; typedef decltype(nullptr) jArray_nullptr_t;
# else # else
// decltype(nullptr) does not evaluate to std::nullptr_t on GCC 4.6.3 // decltype(nullptr) does not evaluate to std::nullptr_t on GCC 4.6.3