diff options
Diffstat (limited to 'debian/patches/pkgsrc/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_NullPtr.h')
| -rw-r--r-- | debian/patches/pkgsrc/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_NullPtr.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/debian/patches/pkgsrc/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_NullPtr.h b/debian/patches/pkgsrc/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_NullPtr.h deleted file mode 100644 index 0c035e0..0000000 --- a/debian/patches/pkgsrc/patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_NullPtr.h +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_NullPtr.h,v 1.2 2013/07/07 18:13:56 adam Exp $ - ---- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/NullPtr.h.orig 2013-06-07 05:16:54.000000000 +0000 -+++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/NullPtr.h -@@ -35,8 +35,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI - #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) - -+#if defined(__clang__) && !defined(_LIBCPP_VERSION) -+namespace std -+{ -+ typedef decltype(nullptr) nullptr_t; -+} -+#endif - #define HAVE_NULLPTR 1 - - #else |