diff options
Diffstat (limited to 'devel/icu/files/patch-common_unicode_platform.h')
| -rw-r--r-- | devel/icu/files/patch-common_unicode_platform.h | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/devel/icu/files/patch-common_unicode_platform.h b/devel/icu/files/patch-common_unicode_platform.h index 895bb50e3de0..60c8a8446aa2 100644 --- a/devel/icu/files/patch-common_unicode_platform.h +++ b/devel/icu/files/patch-common_unicode_platform.h @@ -1,6 +1,6 @@ ---- common/unicode/platform.h.orig 2016-03-23 20:49:58 UTC +--- common/unicode/platform.h.orig 2017-03-22 19:06:26 UTC +++ common/unicode/platform.h -@@ -379,8 +379,8 @@ +@@ -382,8 +382,8 @@ */ #ifdef U_IS_BIG_ENDIAN /* Use the predefined value. */ @@ -11,3 +11,21 @@ #elif defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) /* gcc */ # define U_IS_BIG_ENDIAN (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) +@@ -498,11 +498,15 @@ + # define U_CPLUSPLUS_VERSION 1 + #endif + +-#if (U_PLATFORM == U_PF_AIX || U_PLATFORM == U_PF_OS390) && defined(__cplusplus) &&(U_CPLUSPLUS_VERSION < 11) ++#if defined(__cplusplus) && (U_CPLUSPLUS_VERSION < 11) + // add in std::nullptr_t + namespace std { ++#if (U_PLATFORM == U_PF_AIX || U_PLATFORM == U_PF_OS390) + typedef decltype(nullptr) nullptr_t; +-}; ++#elif defined(__GNUC__) && !defined(__clang__) ++ typedef __decltype(__null) nullptr_t; ++#endif ++} + #endif + + /** |