mirror of
https://git.freebsd.org/ports.git
synced 2025-07-09 13:29:24 -04:00
a382198617
- Temporarily keep C++98 working in consumers for Clang's default -std= Changes: http://site.icu-project.org/download/59 PR: 218788 Submitted by: takefu@airport.fm, dcarmich@dcarmichael.net (early version) Exp-run by: antoine
31 lines
1 KiB
C++
31 lines
1 KiB
C++
--- common/unicode/platform.h.orig 2017-03-22 19:06:26 UTC
|
|
+++ common/unicode/platform.h
|
|
@@ -382,8 +382,8 @@
|
|
*/
|
|
#ifdef U_IS_BIG_ENDIAN
|
|
/* Use the predefined value. */
|
|
-#elif defined(BYTE_ORDER) && defined(BIG_ENDIAN)
|
|
-# define U_IS_BIG_ENDIAN (BYTE_ORDER == BIG_ENDIAN)
|
|
+#elif defined(_BYTE_ORDER) && defined(_BIG_ENDIAN)
|
|
+# define U_IS_BIG_ENDIAN (_BYTE_ORDER == _BIG_ENDIAN)
|
|
#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
|
|
|
|
/**
|