diff options
| author | Brian Jensen <Jensen.J.Brian@gmail.com> | 2013-11-11 12:00:28 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-28 15:04:20 +0100 |
| commit | 896dcd3401df5ce252050dc3315542e82769775e (patch) | |
| tree | b8e7d3a37018141c6418ce7ae52058ac2013ef21 /src/3rdparty/webkit | |
| parent | 08718d2e692bfa78654efd8beafc87197522dca6 (diff) | |
Backported fix for WebKit libc++ support on OS X Mavricks
As of OS X 10.9 Mavericks libc++ is the default standard library
implementation. This fix is necessary for building WebKit on OS X
Mavericks when using libc++. Upstream Change:
http://trac.webkit.org/changeset/107489
Task-number: QTBUG-34652
Change-Id: Ieb30c115b85045adc3e82ee039c541c973b72a3c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'src/3rdparty/webkit')
| -rw-r--r-- | src/3rdparty/webkit/Source/JavaScriptCore/wtf/NullPtr.cpp | 2 | ||||
| -rw-r--r-- | src/3rdparty/webkit/Source/JavaScriptCore/wtf/NullPtr.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/NullPtr.cpp b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/NullPtr.cpp index 224f1f1ec4..c1ad88a98f 100644 --- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/NullPtr.cpp +++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/NullPtr.cpp @@ -27,7 +27,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "config.h" #include "NullPtr.h" -#if !HAVE(NULLPTR) +#if !(HAVE(NULLPTR) || defined(_LIBCPP_VERSION)) std::nullptr_t nullptr; diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/NullPtr.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/NullPtr.h index 9c4319d2cc..742405acbc 100644 --- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/NullPtr.h +++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/NullPtr.h @@ -35,7 +35,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define __has_feature(feature) 0 #endif -#if __has_feature(cxx_nullptr) || (GCC_VERSION_AT_LEAST(4, 6, 0) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && _MSC_VER >= 1600 && !COMPILER(INTEL)) +#if __has_feature(cxx_nullptr) || (GCC_VERSION_AT_LEAST(4, 6, 0) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && _MSC_VER >= 1600 && !COMPILER(INTEL)) || defined(_LIBCPP_VERSION) #define HAVE_NULLPTR 1 |